Skip to content

Commit 25ad907

Browse files
author
elasticsearchmachine
committed
[CI] Auto commit changes from spotless
1 parent 0c45f65 commit 25ad907

File tree

9 files changed

+24
-15
lines changed

9 files changed

+24
-15
lines changed

x-pack/plugin/logsdb/src/javaRestTest/java/org/elasticsearch/xpack/logsdb/patterntext/PatternTextBasicRestIT.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
import org.elasticsearch.common.time.DateFormatter;
1616
import org.elasticsearch.common.time.FormatNames;
1717
import org.elasticsearch.test.cluster.ElasticsearchCluster;
18-
import org.elasticsearch.test.cluster.FeatureFlag;
1918
import org.elasticsearch.test.cluster.local.distribution.DistributionType;
2019
import org.elasticsearch.test.rest.ESRestTestCase;
2120
import org.elasticsearch.test.rest.ObjectPath;

x-pack/plugin/logsdb/src/javaRestTest/java/org/elasticsearch/xpack/logsdb/patterntext/PatternTextLicenseDowngradeIT.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77

88
package org.elasticsearch.xpack.logsdb.patterntext;
99

10-
import org.elasticsearch.Build;
1110
import org.elasticsearch.xpack.logsdb.DataStreamLicenseChangeTestCase;
1211
import org.junit.Before;
1312

x-pack/plugin/logsdb/src/javaRestTest/java/org/elasticsearch/xpack/logsdb/patterntext/PatternTextLicenseUpgradeIT.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77

88
package org.elasticsearch.xpack.logsdb.patterntext;
99

10-
import org.elasticsearch.Build;
1110
import org.elasticsearch.xpack.logsdb.DataStreamLicenseChangeTestCase;
1211
import org.junit.Before;
1312

x-pack/plugin/logsdb/src/main/java/org/elasticsearch/xpack/logsdb/LogsDBPlugin.java

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626

2727
import java.util.ArrayList;
2828
import java.util.Collection;
29-
import java.util.Collections;
3029
import java.util.List;
3130
import java.util.Map;
3231

@@ -94,7 +93,12 @@ public Collection<IndexSettingProvider> getAdditionalIndexSettingProviders(Index
9493

9594
@Override
9695
public List<Setting<?>> getSettings() {
97-
return List.of(FALLBACK_SETTING, CLUSTER_LOGSDB_ENABLED, LOGSDB_PRIOR_LOGS_USAGE, PatternTextFieldMapper.DISABLE_TEMPLATING_SETTING);
96+
return List.of(
97+
FALLBACK_SETTING,
98+
CLUSTER_LOGSDB_ENABLED,
99+
LOGSDB_PRIOR_LOGS_USAGE,
100+
PatternTextFieldMapper.DISABLE_TEMPLATING_SETTING
101+
);
98102
}
99103

100104
@Override
@@ -107,7 +111,7 @@ public List<ActionPlugin.ActionHandler> getActions() {
107111

108112
@Override
109113
public Map<String, Mapper.TypeParser> getMappers() {
110-
return singletonMap(PatternTextFieldType.CONTENT_TYPE, PatternTextFieldMapper.PARSER);
114+
return singletonMap(PatternTextFieldType.CONTENT_TYPE, PatternTextFieldMapper.PARSER);
111115
}
112116

113117
protected XPackLicenseState getLicenseState() {

x-pack/plugin/logsdb/src/main/java/org/elasticsearch/xpack/logsdb/patterntext/PatternTextFieldMapper.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
import org.apache.lucene.index.LeafReader;
1818
import org.apache.lucene.util.BytesRef;
1919
import org.elasticsearch.common.settings.Setting;
20-
import org.elasticsearch.common.util.FeatureFlag;
2120
import org.elasticsearch.index.IndexSettings;
2221
import org.elasticsearch.index.IndexVersion;
2322
import org.elasticsearch.index.analysis.AnalyzerScope;

x-pack/plugin/logsdb/src/test/java/org/elasticsearch/xpack/logsdb/LogsdbIndexSettingsProviderLegacyLicenseTests.java

Lines changed: 17 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,10 @@ public void testGetAdditionalIndexSettingsDefault() {
7777
builder
7878
);
7979
var result = builder.build();
80-
var expected = Settings.builder().put(IndexSettings.INDEX_MAPPER_SOURCE_MODE_SETTING.getKey(), "STORED").put(PatternTextFieldMapper.DISABLE_TEMPLATING_SETTING.getKey(), true).build();
80+
var expected = Settings.builder()
81+
.put(IndexSettings.INDEX_MAPPER_SOURCE_MODE_SETTING.getKey(), "STORED")
82+
.put(PatternTextFieldMapper.DISABLE_TEMPLATING_SETTING.getKey(), true)
83+
.build();
8184
assertEquals(expected, result);
8285
}
8386

@@ -98,13 +101,17 @@ public void testGetAdditionalIndexSettingsApm() throws IOException {
98101
builder
99102
);
100103
var result = builder.build();
101-
Settings expectedAdditionalSettings = Settings.builder().put(PatternTextFieldMapper.DISABLE_TEMPLATING_SETTING.getKey(), true).build();
104+
Settings expectedAdditionalSettings = Settings.builder()
105+
.put(PatternTextFieldMapper.DISABLE_TEMPLATING_SETTING.getKey(), true)
106+
.build();
102107
assertEquals(expectedAdditionalSettings, result);
103108
}
104109

105110
public void testGetAdditionalIndexSettingsProfiling() throws IOException {
106111
Settings settings = Settings.builder().put(IndexSettings.INDEX_MAPPER_SOURCE_MODE_SETTING.getKey(), "SYNTHETIC").build();
107-
Settings expectedAdditionalSettings = Settings.builder().put(PatternTextFieldMapper.DISABLE_TEMPLATING_SETTING.getKey(), true).build();
112+
Settings expectedAdditionalSettings = Settings.builder()
113+
.put(PatternTextFieldMapper.DISABLE_TEMPLATING_SETTING.getKey(), true)
114+
.build();
108115
for (String dataStreamName : new String[] { "profiling-metrics", "profiling-events" }) {
109116
String indexName = DataStream.getDefaultBackingIndexName(dataStreamName, 0);
110117
Settings.Builder builder = Settings.builder();
@@ -148,7 +155,9 @@ public void testGetAdditionalIndexSettingsTsdb() throws IOException {
148155
builder
149156
);
150157
var result = builder.build();
151-
Settings expectedAdditionalSettings = Settings.builder().put(PatternTextFieldMapper.DISABLE_TEMPLATING_SETTING.getKey(), true).build();
158+
Settings expectedAdditionalSettings = Settings.builder()
159+
.put(PatternTextFieldMapper.DISABLE_TEMPLATING_SETTING.getKey(), true)
160+
.build();
152161
assertEquals(expectedAdditionalSettings, result);
153162
}
154163

@@ -193,7 +202,10 @@ public void testGetAdditionalIndexSettingsTsdbAfterCutoffDate() throws Exception
193202
);
194203

195204
var result = builder.build();
196-
var expected = Settings.builder().put(IndexSettings.INDEX_MAPPER_SOURCE_MODE_SETTING.getKey(), "STORED").put(PatternTextFieldMapper.DISABLE_TEMPLATING_SETTING.getKey(), true).build();
205+
var expected = Settings.builder()
206+
.put(IndexSettings.INDEX_MAPPER_SOURCE_MODE_SETTING.getKey(), "STORED")
207+
.put(PatternTextFieldMapper.DISABLE_TEMPLATING_SETTING.getKey(), true)
208+
.build();
197209
assertEquals(expected, result);
198210
}
199211
}

x-pack/plugin/logsdb/src/test/java/org/elasticsearch/xpack/logsdb/patterntext/PatternTextFieldMapperTests.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,6 @@
5252
import org.elasticsearch.xcontent.json.JsonXContent;
5353
import org.elasticsearch.xpack.logsdb.LogsDBPlugin;
5454
import org.junit.AssumptionViolatedException;
55-
import org.junit.Before;
5655

5756
import java.io.IOException;
5857
import java.util.ArrayList;

x-pack/plugin/logsdb/src/test/java/org/elasticsearch/xpack/logsdb/patterntext/PatternTextIntegrationTests.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@
3535
import org.elasticsearch.xpack.core.XPackPlugin;
3636
import org.elasticsearch.xpack.logsdb.LogsDBPlugin;
3737
import org.junit.After;
38-
import org.junit.Before;
3938

4039
import java.io.IOException;
4140
import java.time.Instant;

x-pack/plugin/logsdb/src/test/java/org/elasticsearch/xpack/logsdb/patterntext/PatternTextNestedObjectTests.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@
2828
import org.elasticsearch.xpack.core.XPackPlugin;
2929
import org.elasticsearch.xpack.logsdb.LogsDBPlugin;
3030
import org.junit.After;
31-
import org.junit.Before;
3231

3332
import java.util.Collection;
3433
import java.util.HashSet;

0 commit comments

Comments
 (0)