Skip to content

Commit 965ef23

Browse files
author
Vincent Potucek
committed
Fix spotless implementation of removeWildcardImports
Signed-off-by: Vincent Potucek <[email protected]>
1 parent a953860 commit 965ef23

File tree

12 files changed

+81
-58
lines changed

12 files changed

+81
-58
lines changed

‎CHANGELOG.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
7373
- Fix Replication lag computation ([#18602](https://github.com/opensearch-project/OpenSearch/pull/18602))
7474
- Fix max_score is null when sorting on score firstly ([#18715](https://github.com/opensearch-project/OpenSearch/pull/18715))
7575
- Fixed Staggered merge - load average replace with AverageTrackers, some Default thresholds modified ([#18666](https://github.com/opensearch-project/OpenSearch/pull/18666))
76+
- Fix spotless implementation of removeWildcardImports ([#18770](https://github.com/opensearch-project/OpenSearch/pull/18770))
7677

7778
### Security
7879

‎build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ plugins {
5454
id 'lifecycle-base'
5555
id 'opensearch.docker-support'
5656
id 'opensearch.global-build-info'
57-
id "com.diffplug.spotless" version "6.25.0" apply false
57+
id "com.diffplug.spotless" version "7.1.0" apply false
5858
id "org.gradle.test-retry" version "1.6.2" apply false
5959
id "test-report-aggregation"
6060
id 'jacoco-report-aggregation'

‎gradle/formatting.gradle‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -85,13 +85,7 @@ allprojects {
8585
eclipse().withP2Mirrors(Map.of("https://download.eclipse.org/", "https://mirror.umd.edu/eclipse/")).configFile rootProject.file('buildSrc/formatterConfig.xml')
8686
trimTrailingWhitespace()
8787
endWithNewline()
88-
89-
custom 'Refuse wildcard imports', {
90-
// Wildcard imports can't be resolved; fail the build
91-
if (it =~ /\s+import .*\*;/) {
92-
throw new AssertionError("Do not use wildcard imports. 'spotlessApply' cannot resolve this issue.")
93-
}
94-
}
88+
removeWildcardImports()
9589

9690
// See DEVELOPER_GUIDE.md for details of when to enable this.
9791
if (System.getProperty('spotless.paddedcell') != null) {

‎plugins/arrow-flight-rpc/src/test/java/org/opensearch/arrow/flight/impl/BaseFlightProducerTests.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -566,8 +566,9 @@ public void testGetFlightInfo_LocationNotFound() {
566566
}
567567

568568
public void testGetFlightInfo_SchemaError() {
569-
when(streamManager.getStreamProducer(any(FlightStreamTicket.class)))
570-
.thenReturn(Optional.of(FlightStreamManager.StreamProducerHolder.create(streamProducer, allocator)));
569+
when(streamManager.getStreamProducer(any(FlightStreamTicket.class))).thenReturn(
570+
Optional.of(FlightStreamManager.StreamProducerHolder.create(streamProducer, allocator))
571+
);
571572
Location location = Location.forGrpcInsecure("localhost", 8815);
572573
when(flightClientManager.getFlightClientLocation(LOCAL_NODE_ID)).thenReturn(Optional.of(location));
573574
when(streamProducer.createRoot(allocator)).thenReturn(mock(VectorSchemaRoot.class));

‎plugins/arrow-flight-rpc/src/test/java/org/opensearch/arrow/flight/impl/FlightStreamReaderTests.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ public void tearDown() throws Exception {
5858
public void testNext_ReturnsTrue_WhenFlightStreamHasNext() throws Exception {
5959
when(mockFlightStream.next()).thenReturn(true);
6060
assertTrue(iterator.next());
61-
assert(mockFlightStream).next();
61+
assert (mockFlightStream).next();
6262
}
6363

6464
public void testNext_ReturnsFalse_WhenFlightStreamHasNoNext() throws Exception {

‎server/src/test/java/org/opensearch/action/admin/indices/create/TransportCreateIndexActionTests.java‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -83,11 +83,7 @@ public void testClusterManagerOperation_usesTransformedMapping() {
8383

8484
// Capture ActionListener passed to applyTransformers
8585
final ArgumentCaptor<ActionListener<String>> listenerCaptor = ArgumentCaptor.forClass(ActionListener.class);
86-
doNothing().when(mappingTransformerRegistry).applyTransformers(
87-
anyString(),
88-
any(),
89-
listenerCaptor.capture()
90-
);
86+
doNothing().when(mappingTransformerRegistry).applyTransformers(anyString(), any(), listenerCaptor.capture());
9187

9288
// Act: Call the method
9389
action.clusterManagerOperation(request, clusterState, responseListener);
@@ -96,8 +92,9 @@ public void testClusterManagerOperation_usesTransformedMapping() {
9692
listenerCaptor.getValue().onResponse(transformedMapping);
9793

9894
// Assert: Capture request sent to createIndexService
99-
ArgumentCaptor<CreateIndexClusterStateUpdateRequest> updateRequestCaptor =
100-
ArgumentCaptor.forClass(CreateIndexClusterStateUpdateRequest.class);
95+
ArgumentCaptor<CreateIndexClusterStateUpdateRequest> updateRequestCaptor = ArgumentCaptor.forClass(
96+
CreateIndexClusterStateUpdateRequest.class
97+
);
10198
verify(createIndexService, times(1)).createIndex(updateRequestCaptor.capture(), any());
10299

103100
// Ensure transformed mapping is passed correctly

‎server/src/test/java/org/opensearch/cluster/routing/remote/RemoteRoutingTableServiceTests.java‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -800,9 +800,7 @@ public void testDeleteStaleIndexRoutingPathsThrowsIOException() throws IOExcepti
800800
doThrow(new IOException("test exception")).when(blobContainer).deleteBlobsIgnoringIfNotExists(Mockito.anyList());
801801

802802
remoteRoutingTableService.doStart();
803-
IOException thrown = assertThrows(IOException.class, () -> {
804-
remoteRoutingTableService.deleteStaleIndexRoutingPaths(stalePaths);
805-
});
803+
IOException thrown = assertThrows(IOException.class, () -> { remoteRoutingTableService.deleteStaleIndexRoutingPaths(stalePaths); });
806804
assertEquals("test exception", thrown.getMessage());
807805
verify(blobContainer).deleteBlobsIgnoringIfNotExists(stalePaths);
808806
}
@@ -823,9 +821,10 @@ public void testDeleteStaleIndexRoutingDiffPathsThrowsIOException() throws IOExc
823821
doThrow(new IOException("test exception")).when(blobContainer).deleteBlobsIgnoringIfNotExists(Mockito.anyList());
824822

825823
remoteRoutingTableService.doStart();
826-
IOException thrown = assertThrows(IOException.class, () -> {
827-
remoteRoutingTableService.deleteStaleIndexRoutingDiffPaths(stalePaths);
828-
});
824+
IOException thrown = assertThrows(
825+
IOException.class,
826+
() -> { remoteRoutingTableService.deleteStaleIndexRoutingDiffPaths(stalePaths); }
827+
);
829828
assertEquals("test exception", thrown.getMessage());
830829
verify(blobContainer).deleteBlobsIgnoringIfNotExists(stalePaths);
831830
}

‎server/src/test/java/org/opensearch/index/autoforcemerge/AutoForceMergeManagerTests.java‎

Lines changed: 26 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -179,13 +179,14 @@ public void testNodeValidatorWithHealthyResources() {
179179
when(cpu.getPercent()).thenReturn((short) 50);
180180
when(jvm.getHeapUsedPercent()).thenReturn((short) 60);
181181
ThreadPoolStats stats = new ThreadPoolStats(
182-
Arrays.asList(new ThreadPoolStats.Stats(
183-
ThreadPool.Names.FORCE_MERGE, 1, 0, 0, 0, 1, 0, 0
184-
))
182+
Arrays.asList(new ThreadPoolStats.Stats(ThreadPool.Names.FORCE_MERGE, 1, 0, 0, 0, 1, 0, 0))
185183
);
186184
when(threadPool.stats()).thenReturn(stats);
187185

188-
AutoForceMergeManager autoForceMergeManager = clusterSetupWithNode(getConfiguredClusterSettings(true, true, Collections.emptyMap()), getNodeWithRoles(DATA_NODE_1, Set.of(DiscoveryNodeRole.DATA_ROLE)));
186+
AutoForceMergeManager autoForceMergeManager = clusterSetupWithNode(
187+
getConfiguredClusterSettings(true, true, Collections.emptyMap()),
188+
getNodeWithRoles(DATA_NODE_1, Set.of(DiscoveryNodeRole.DATA_ROLE))
189+
);
189190
autoForceMergeManager.start();
190191
assertTrue(autoForceMergeManager.getNodeValidator().validate().isAllowed());
191192
autoForceMergeManager.close();
@@ -195,13 +196,14 @@ public void testNodeValidatorWithFeatureSwitch() {
195196
when(cpu.getPercent()).thenReturn((short) 50);
196197
when(jvm.getHeapUsedPercent()).thenReturn((short) 60);
197198
ThreadPoolStats stats = new ThreadPoolStats(
198-
Arrays.asList(new ThreadPoolStats.Stats(
199-
ThreadPool.Names.FORCE_MERGE, 1, 0, 0, 0, 1, 0, 0
200-
))
199+
Arrays.asList(new ThreadPoolStats.Stats(ThreadPool.Names.FORCE_MERGE, 1, 0, 0, 0, 1, 0, 0))
201200
);
202201
when(threadPool.stats()).thenReturn(stats);
203202
Settings settings = getConfiguredClusterSettings(false, false, Collections.emptyMap());
204-
AutoForceMergeManager autoForceMergeManager = clusterSetupWithNode(settings, getNodeWithRoles(DATA_NODE_1, Set.of(DiscoveryNodeRole.DATA_ROLE)));
203+
AutoForceMergeManager autoForceMergeManager = clusterSetupWithNode(
204+
settings,
205+
getNodeWithRoles(DATA_NODE_1, Set.of(DiscoveryNodeRole.DATA_ROLE))
206+
);
205207
autoForceMergeManager.start();
206208
assertFalse(autoForceMergeManager.getConfigurationValidator().validate().isAllowed());
207209
assertNotEquals(Lifecycle.State.STARTED, ResourceTrackerProvider.resourceTrackers.cpuFiveMinute.lifecycleState());
@@ -249,22 +251,28 @@ public void testNodeValidatorWithHighCPU() {
249251
public void testNodeValidatorWithHighDiskUsage() {
250252
when(cpu.getPercent()).thenReturn((short) 50);
251253
when(disk.getAvailable()).thenReturn(new ByteSizeValue(5));
252-
AutoForceMergeManager autoForceMergeManager = clusterSetupWithNode(getConfiguredClusterSettings(true, true, Collections.emptyMap()), getNodeWithRoles(DATA_NODE_1, Set.of(DiscoveryNodeRole.DATA_ROLE)));
254+
AutoForceMergeManager autoForceMergeManager = clusterSetupWithNode(
255+
getConfiguredClusterSettings(true, true, Collections.emptyMap()),
256+
getNodeWithRoles(DATA_NODE_1, Set.of(DiscoveryNodeRole.DATA_ROLE))
257+
);
253258
autoForceMergeManager.start();
254259
assertFalse(autoForceMergeManager.getNodeValidator().validate().isAllowed());
255260
autoForceMergeManager.close();
256261
}
257262

258263
public void testNodeValidatorWithHighJVMUsage() {
259264
when(cpu.getPercent()).thenReturn((short) 50);
260-
AutoForceMergeManager autoForceMergeManager = clusterSetupWithNode(getConfiguredClusterSettings(true, true, Collections.emptyMap()), getNodeWithRoles(DATA_NODE_1, Set.of(DiscoveryNodeRole.DATA_ROLE)));
265+
AutoForceMergeManager autoForceMergeManager = clusterSetupWithNode(
266+
getConfiguredClusterSettings(true, true, Collections.emptyMap()),
267+
getNodeWithRoles(DATA_NODE_1, Set.of(DiscoveryNodeRole.DATA_ROLE))
268+
);
261269
autoForceMergeManager.start();
262270
when(jvm.getHeapUsedPercent()).thenReturn((short) 90);
263271
assertFalse(autoForceMergeManager.getNodeValidator().validate().isAllowed());
264-
for(int i = 0; i < 10; i++)
272+
for (int i = 0; i < 10; i++)
265273
ResourceTrackerProvider.resourceTrackers.jvmOneMinute.recordUsage(90);
266274
assertFalse(autoForceMergeManager.getNodeValidator().validate().isAllowed());
267-
for(int i = 0; i < 10; i++)
275+
for (int i = 0; i < 10; i++)
268276
ResourceTrackerProvider.resourceTrackers.jvmFiveMinute.recordUsage(90);
269277
assertFalse(autoForceMergeManager.getNodeValidator().validate().isAllowed());
270278
autoForceMergeManager.close();
@@ -274,12 +282,13 @@ public void testNodeValidatorWithInsufficientForceMergeThreads() {
274282
when(cpu.getPercent()).thenReturn((short) 50);
275283
when(jvm.getHeapUsedPercent()).thenReturn((short) 50);
276284
ThreadPoolStats stats = new ThreadPoolStats(
277-
Arrays.asList(new ThreadPoolStats.Stats(
278-
ThreadPool.Names.FORCE_MERGE, 1, 1, 1, 0, 1, 0, -1
279-
))
285+
Arrays.asList(new ThreadPoolStats.Stats(ThreadPool.Names.FORCE_MERGE, 1, 1, 1, 0, 1, 0, -1))
280286
);
281287
when(threadPool.stats()).thenReturn(stats);
282-
AutoForceMergeManager autoForceMergeManager = clusterSetupWithNode(getConfiguredClusterSettings(true, true, Collections.emptyMap()), getNodeWithRoles(DATA_NODE_1, Set.of(DiscoveryNodeRole.DATA_ROLE)));
288+
AutoForceMergeManager autoForceMergeManager = clusterSetupWithNode(
289+
getConfiguredClusterSettings(true, true, Collections.emptyMap()),
290+
getNodeWithRoles(DATA_NODE_1, Set.of(DiscoveryNodeRole.DATA_ROLE))
291+
);
283292
autoForceMergeManager.start();
284293
assertFalse(autoForceMergeManager.getNodeValidator().validate().isAllowed());
285294
ThreadPoolStats emptyStats = new ThreadPoolStats(Collections.emptyList());
@@ -553,12 +562,7 @@ private AutoForceMergeManager clusterSetupWithNode(Settings settings, DiscoveryN
553562
when(clusterService.getSettings()).thenReturn(settings);
554563
when(clusterService.localNode()).thenReturn(node);
555564

556-
return new AutoForceMergeManager(
557-
threadPool,
558-
monitorService,
559-
indicesService,
560-
clusterService
561-
);
565+
return new AutoForceMergeManager(threadPool, monitorService, indicesService, clusterService);
562566
}
563567

564568
private IndexShard getShard(String indexName, TranslogStats translogStats, Integer segmentCount) {

‎server/src/test/java/org/opensearch/index/compositeindex/datacube/startree/builder/StarTreesBuilderTests.java‎

Lines changed: 19 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -104,16 +104,32 @@ public void test_buildWithNoStarTreeFields() throws IOException {
104104
public void test_getStarTreeBuilder() throws IOException {
105105
when(mapperService.getCompositeFieldTypes()).thenReturn(Set.of(starTreeFieldType));
106106
StarTreesBuilder starTreesBuilder = new StarTreesBuilder(segmentWriteState, mapperService, new AtomicInteger());
107-
StarTreeBuilder starTreeBuilder = starTreesBuilder.getStarTreeBuilder(metaOut, dataOut, starTreeField, segmentWriteState, mapperService);
107+
StarTreeBuilder starTreeBuilder = starTreesBuilder.getStarTreeBuilder(
108+
metaOut,
109+
dataOut,
110+
starTreeField,
111+
segmentWriteState,
112+
mapperService
113+
);
108114
assertTrue(starTreeBuilder instanceof OnHeapStarTreeBuilder);
109115
}
110116

111117
public void test_getStarTreeBuilder_illegalArgument() throws IOException {
112118
when(mapperService.getCompositeFieldTypes()).thenReturn(Set.of(starTreeFieldType));
113-
StarTreeFieldConfiguration starTreeFieldConfiguration = new StarTreeFieldConfiguration(1, new HashSet<>(), StarTreeFieldConfiguration.StarTreeBuildMode.OFF_HEAP);
119+
StarTreeFieldConfiguration starTreeFieldConfiguration = new StarTreeFieldConfiguration(
120+
1,
121+
new HashSet<>(),
122+
StarTreeFieldConfiguration.StarTreeBuildMode.OFF_HEAP
123+
);
114124
StarTreeField starTreeField = new StarTreeField("star_tree", new ArrayList<>(), new ArrayList<>(), starTreeFieldConfiguration);
115125
StarTreesBuilder starTreesBuilder = new StarTreesBuilder(segmentWriteState, mapperService, new AtomicInteger());
116-
StarTreeBuilder starTreeBuilder = starTreesBuilder.getStarTreeBuilder(metaOut, dataOut, starTreeField, segmentWriteState, mapperService);
126+
StarTreeBuilder starTreeBuilder = starTreesBuilder.getStarTreeBuilder(
127+
metaOut,
128+
dataOut,
129+
starTreeField,
130+
segmentWriteState,
131+
mapperService
132+
);
117133
assertTrue(starTreeBuilder instanceof OffHeapStarTreeBuilder);
118134
starTreeBuilder.close();
119135
}

‎server/src/test/java/org/opensearch/index/store/RemoteSegmentStoreDirectoryTests.java‎

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -135,9 +135,12 @@ public void testGetPrimaryTermGenerationUuid() {
135135
}
136136

137137
public void testInitException() throws IOException {
138-
when(remoteMetadataDirectory.listFilesByPrefixInLexicographicOrder(RemoteSegmentStoreDirectory.MetadataFilenameUtils.METADATA_PREFIX, METADATA_FILES_TO_FETCH)).thenThrow(
139-
new IOException("Error")
140-
);
138+
when(
139+
remoteMetadataDirectory.listFilesByPrefixInLexicographicOrder(
140+
RemoteSegmentStoreDirectory.MetadataFilenameUtils.METADATA_PREFIX,
141+
METADATA_FILES_TO_FETCH
142+
)
143+
).thenThrow(new IOException("Error"));
141144

142145
assertThrows(IOException.class, () -> remoteSegmentStoreDirectory.init());
143146
}
@@ -155,9 +158,12 @@ public void testInitNoMetadataFile() throws IOException {
155158
}
156159

157160
public void testInitMultipleMetadataFile() throws IOException {
158-
when(remoteMetadataDirectory.listFilesByPrefixInLexicographicOrder(RemoteSegmentStoreDirectory.MetadataFilenameUtils.METADATA_PREFIX, METADATA_FILES_TO_FETCH)).thenReturn(
159-
List.of(metadataFilename, metadataFilenameDup)
160-
);
161+
when(
162+
remoteMetadataDirectory.listFilesByPrefixInLexicographicOrder(
163+
RemoteSegmentStoreDirectory.MetadataFilenameUtils.METADATA_PREFIX,
164+
METADATA_FILES_TO_FETCH
165+
)
166+
).thenReturn(List.of(metadataFilename, metadataFilenameDup));
161167
assertThrows(IllegalStateException.class, () -> remoteSegmentStoreDirectory.init());
162168
}
163169

0 commit comments

Comments
 (0)