Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit fdec16b

Browse files
committedMar 12, 2025··
Spotless apply
Signed-off-by: Finn Carroll <carrofin@amazon.com>
1 parent e4830ab commit fdec16b

File tree

11 files changed

+21
-26
lines changed

11 files changed

+21
-26
lines changed
 

‎plugins/arrow-flight-rpc/src/test/java/org/opensearch/arrow/flight/bootstrap/FlightClientManagerTests.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -54,13 +54,13 @@
5454
import io.netty.util.NettyRuntime;
5555

5656
import static org.opensearch.arrow.flight.bootstrap.FlightClientManager.LOCATION_TIMEOUT_MS;
57+
import static org.opensearch.common.util.FeatureFlags.ARROW_STREAMS_SETTING;
5758
import static org.mockito.ArgumentMatchers.any;
5859
import static org.mockito.ArgumentMatchers.eq;
5960
import static org.mockito.Mockito.doAnswer;
6061
import static org.mockito.Mockito.mock;
6162
import static org.mockito.Mockito.reset;
6263
import static org.mockito.Mockito.when;
63-
import static org.opensearch.common.util.FeatureFlags.ARROW_STREAMS_SETTING;
6464

6565
@SuppressWarnings("unchecked")
6666
public class FlightClientManagerTests extends OpenSearchTestCase {

‎plugins/arrow-flight-rpc/src/test/java/org/opensearch/arrow/flight/bootstrap/FlightServiceTests.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,9 @@
3131
import java.util.concurrent.ExecutorService;
3232
import java.util.concurrent.atomic.AtomicInteger;
3333

34+
import static org.opensearch.common.util.FeatureFlags.ARROW_STREAMS_SETTING;
3435
import static org.mockito.Mockito.mock;
3536
import static org.mockito.Mockito.when;
36-
import static org.opensearch.common.util.FeatureFlags.ARROW_STREAMS_SETTING;
3737

3838
public class FlightServiceTests extends OpenSearchTestCase {
3939

‎server/src/main/java/org/opensearch/common/util/FeatureFlags.java

+15-13
Original file line numberDiff line numberDiff line change
@@ -141,19 +141,21 @@ public class FeatureFlags {
141141
public static final Setting<Boolean> ARROW_STREAMS_SETTING = Setting.boolSetting(ARROW_STREAMS, false, Property.NodeScope);
142142

143143
// mutable for testing
144-
private static final ArrayList<Setting<Boolean>> ALL_FEATURE_FLAG_SETTINGS = new ArrayList<>(List.of(
145-
REMOTE_STORE_MIGRATION_EXPERIMENTAL_SETTING,
146-
EXTENSIONS_SETTING,
147-
TELEMETRY_SETTING,
148-
DATETIME_FORMATTER_CACHING_SETTING,
149-
TIERED_REMOTE_INDEX_SETTING,
150-
PLUGGABLE_CACHE_SETTING,
151-
STAR_TREE_INDEX_SETTING,
152-
APPLICATION_BASED_CONFIGURATION_TEMPLATES_SETTING,
153-
READER_WRITER_SPLIT_EXPERIMENTAL_SETTING,
154-
TERM_VERSION_PRECOMMIT_ENABLE_SETTING,
155-
ARROW_STREAMS_SETTING
156-
));
144+
private static final ArrayList<Setting<Boolean>> ALL_FEATURE_FLAG_SETTINGS = new ArrayList<>(
145+
List.of(
146+
REMOTE_STORE_MIGRATION_EXPERIMENTAL_SETTING,
147+
EXTENSIONS_SETTING,
148+
TELEMETRY_SETTING,
149+
DATETIME_FORMATTER_CACHING_SETTING,
150+
TIERED_REMOTE_INDEX_SETTING,
151+
PLUGGABLE_CACHE_SETTING,
152+
STAR_TREE_INDEX_SETTING,
153+
APPLICATION_BASED_CONFIGURATION_TEMPLATES_SETTING,
154+
READER_WRITER_SPLIT_EXPERIMENTAL_SETTING,
155+
TERM_VERSION_PRECOMMIT_ENABLE_SETTING,
156+
ARROW_STREAMS_SETTING
157+
)
158+
);
157159

158160
/**
159161
* Underlying implementation for feature flags.

‎server/src/test/java/org/opensearch/cluster/applicationtemplates/SystemTemplatesServiceTests.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@
2323
import org.mockito.Mockito;
2424

2525
import static org.opensearch.common.settings.ClusterSettings.BUILT_IN_CLUSTER_SETTINGS;
26-
import static org.mockito.Mockito.when;
2726
import static org.opensearch.common.util.FeatureFlags.APPLICATION_BASED_CONFIGURATION_TEMPLATES;
27+
import static org.mockito.Mockito.when;
2828

2929
public class SystemTemplatesServiceTests extends OpenSearchTestCase {
3030

‎server/src/test/java/org/opensearch/cluster/metadata/MetadataIndexTemplateServiceTests.java

+1-4
Original file line numberDiff line numberDiff line change
@@ -2752,9 +2752,6 @@ protected boolean resetNodeAfterTest() {
27522752

27532753
@Override
27542754
protected Settings featureFlagSettings() {
2755-
return Settings.builder()
2756-
.put(super.featureFlagSettings())
2757-
.put(APPLICATION_BASED_CONFIGURATION_TEMPLATES, false)
2758-
.build();
2755+
return Settings.builder().put(super.featureFlagSettings()).put(APPLICATION_BASED_CONFIGURATION_TEMPLATES, false).build();
27592756
}
27602757
}

‎server/src/test/java/org/opensearch/common/settings/SettingsModuleTests.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,9 @@
4242
import java.util.Arrays;
4343

4444
import static java.util.Collections.emptySet;
45+
import static org.opensearch.common.util.FeatureFlags.EXTENSIONS;
4546
import static org.hamcrest.Matchers.containsString;
4647
import static org.hamcrest.Matchers.is;
47-
import static org.opensearch.common.util.FeatureFlags.EXTENSIONS;
4848

4949
public class SettingsModuleTests extends ModuleTestCase {
5050

‎server/src/test/java/org/opensearch/index/engine/ReadOnlyEngineTests.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -61,10 +61,10 @@
6161
import java.util.function.Function;
6262

6363
import static org.opensearch.common.lucene.index.OpenSearchDirectoryReader.getOpenSearchDirectoryReader;
64+
import static org.opensearch.common.util.FeatureFlags.SEARCHABLE_SNAPSHOT_EXTENDED_COMPATIBILITY;
6465
import static org.hamcrest.Matchers.equalTo;
6566
import static org.hamcrest.Matchers.greaterThan;
6667
import static org.hamcrest.Matchers.instanceOf;
67-
import static org.opensearch.common.util.FeatureFlags.SEARCHABLE_SNAPSHOT_EXTENDED_COMPATIBILITY;
6868

6969
public class ReadOnlyEngineTests extends EngineTestCase {
7070

‎server/src/test/java/org/opensearch/search/aggregations/startree/DateHistogramAggregatorTests.java

-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@
2828
import org.apache.lucene.tests.index.RandomIndexWriter;
2929
import org.opensearch.common.Rounding;
3030
import org.opensearch.common.lucene.Lucene;
31-
import org.opensearch.common.settings.Settings;
3231
import org.opensearch.common.util.FeatureFlags;
3332
import org.opensearch.core.xcontent.XContentBuilder;
3433
import org.opensearch.index.codec.composite.CompositeIndexFieldInfo;

‎server/src/test/java/org/opensearch/search/aggregations/startree/KeywordTermsAggregatorTests.java

-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@
3131
import org.apache.lucene.util.BytesRef;
3232
import org.apache.lucene.util.NumericUtils;
3333
import org.opensearch.common.lucene.Lucene;
34-
import org.opensearch.common.settings.Settings;
3534
import org.opensearch.common.util.FeatureFlags;
3635
import org.opensearch.index.codec.composite.CompositeIndexFieldInfo;
3736
import org.opensearch.index.codec.composite.CompositeIndexReader;

‎server/src/test/java/org/opensearch/search/aggregations/startree/NumericTermsAggregatorTests.java

-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727
import org.apache.lucene.tests.index.RandomIndexWriter;
2828
import org.apache.lucene.util.NumericUtils;
2929
import org.opensearch.common.lucene.Lucene;
30-
import org.opensearch.common.settings.Settings;
3130
import org.opensearch.common.util.FeatureFlags;
3231
import org.opensearch.core.xcontent.XContentBuilder;
3332
import org.opensearch.index.codec.composite.CompositeIndexFieldInfo;

‎server/src/test/java/org/opensearch/search/aggregations/startree/StarTreeFilterTests.java

-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
import org.apache.lucene.tests.index.RandomIndexWriter;
2525
import org.apache.lucene.util.FixedBitSet;
2626
import org.opensearch.common.lucene.Lucene;
27-
import org.opensearch.common.settings.Settings;
2827
import org.opensearch.common.util.FeatureFlags;
2928
import org.opensearch.core.xcontent.XContentBuilder;
3029
import org.opensearch.index.codec.composite.CompositeIndexFieldInfo;

0 commit comments

Comments
 (0)
Please sign in to comment.