Skip to content

Commit 68817d7

Browse files
authored
Rename o.e.common in libs/core to o.e.core (#73909)
When libs/core was created, several classes were moved from server's o.e.common package, but they were not moved to a new package. Split packages need to go away long term, so that Elasticsearch can even think about modularization. This commit moves all the classes under o.e.common in core to o.e.core. relates #73784
1 parent 622d466 commit 68817d7

File tree

3,142 files changed

+4047
-4049
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

3,142 files changed

+4047
-4049
lines changed

benchmarks/src/main/java/org/elasticsearch/benchmark/search/aggregations/AggConstructionContentionBenchmark.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
import org.apache.lucene.search.Query;
1515
import org.elasticsearch.common.breaker.CircuitBreaker;
1616
import org.elasticsearch.common.breaker.PreallocatedCircuitBreakerService;
17-
import org.elasticsearch.common.lease.Releasable;
18-
import org.elasticsearch.common.lease.Releasables;
17+
import org.elasticsearch.core.Releasable;
18+
import org.elasticsearch.core.Releasables;
1919
import org.elasticsearch.common.settings.ClusterSettings;
2020
import org.elasticsearch.common.settings.Settings;
2121
import org.elasticsearch.common.util.BigArrays;

benchmarks/src/main/java/org/elasticsearch/common/RoundingBenchmark.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
package org.elasticsearch.common;
1010

1111
import org.elasticsearch.common.time.DateFormatter;
12-
import org.elasticsearch.common.unit.TimeValue;
12+
import org.elasticsearch.core.TimeValue;
1313
import org.elasticsearch.search.aggregations.bucket.histogram.DateHistogramAggregationBuilder;
1414
import org.openjdk.jmh.annotations.Benchmark;
1515
import org.openjdk.jmh.annotations.BenchmarkMode;

build-tools-internal/src/main/resources/eclipse.settings/org.eclipse.jdt.core.prefs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ eclipse.preferences.version=1
66
# (e.g. crashing eclipse etc)
77
# org.eclipse.jdt.core.compiler.annotation.inheritNullAnnotations=enabled
88
# org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore
9-
# org.eclipse.jdt.core.compiler.annotation.nullable=org.elasticsearch.common.Nullable
9+
# org.eclipse.jdt.core.compiler.annotation.nullable=org.elasticsearch.core.Nullable
1010
# org.eclipse.jdt.core.compiler.annotation.nullanalysis=enabled
1111
# org.eclipse.jdt.core.compiler.problem.nonnullParameterAnnotationDropped=warning
1212
# org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=warning
@@ -27,4 +27,4 @@ org.eclipse.jdt.core.formatter.tabulation.size=4
2727
# and have much tighter control of the warnings in the forbidden APIs gradle
2828
# task which is the definitive list of allowed references.
2929
org.eclipse.jdt.core.compiler.problem.forbiddenReference=ignore
30-
org.eclipse.jdt.core.compiler.problem.discouragedReference=ignore
30+
org.eclipse.jdt.core.compiler.problem.discouragedReference=ignore

build-tools-internal/src/main/resources/forbidden/es-all-signatures.txt

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44
# in compliance with, at your election, the Elastic License 2.0 or the Server
55
# Side Public License, v 1.
66

7-
java.nio.file.Paths @ Use org.elasticsearch.common.io.PathUtils.get() instead.
8-
java.nio.file.Path#of(java.net.URI) @ Use org.elasticsearch.common.io.PathUtils.get() instead.
9-
java.nio.file.Path#of(java.lang.String, java.lang.String[]) @ Use org.elasticsearch.common.io.PathUtils.get() instead.
10-
java.nio.file.FileSystems#getDefault() @ use org.elasticsearch.common.io.PathUtils.getDefaultFileSystem() instead.
7+
java.nio.file.Paths @ Use org.elasticsearch.core.PathUtils.get() instead.
8+
java.nio.file.Path#of(java.net.URI) @ Use org.elasticsearch.core.PathUtils.get() instead.
9+
java.nio.file.Path#of(java.lang.String, java.lang.String[]) @ Use org.elasticsearch.core.PathUtils.get() instead.
10+
java.nio.file.FileSystems#getDefault() @ use org.elasticsearch.core.PathUtils.getDefaultFileSystem() instead.
1111

1212
java.nio.file.Files#getFileStore(java.nio.file.Path) @ Use org.elasticsearch.env.Environment.getFileStore() instead, impacted by JDK-8034057
1313
java.nio.file.Files#isWritable(java.nio.file.Path) @ Use org.elasticsearch.env.Environment.isWritable() instead, impacted by JDK-8034057
@@ -34,11 +34,11 @@ java.nio.channels.SocketChannel#connect(java.net.SocketAddress)
3434

3535
# This method is misleading, and uses lenient boolean parsing under the hood. If you intend to parse
3636
# a system property as a boolean, use
37-
# org.elasticsearch.common.Booleans#parseBoolean(java.lang.String) on the result of
37+
# org.elasticsearch.core.Booleans#parseBoolean(java.lang.String) on the result of
3838
# java.lang.SystemProperty#getProperty(java.lang.String) instead. If you were not intending to parse
3939
# a system property as a boolean, but instead parse a string to a boolean, use
40-
# org.elasticsearch.common.Booleans#parseBoolean(java.lang.String) directly on the string.
41-
@defaultMessage use org.elasticsearch.common.Booleans#parseBoolean(java.lang.String)
40+
# org.elasticsearch.core.Booleans#parseBoolean(java.lang.String) directly on the string.
41+
@defaultMessage use org.elasticsearch.core.Booleans#parseBoolean(java.lang.String)
4242
java.lang.Boolean#getBoolean(java.lang.String)
4343

4444
org.apache.lucene.util.IOUtils @ use @org.elasticsearch.core.internal.io instead

build-tools-internal/src/main/resources/forbidden/es-server-signatures.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,8 +61,8 @@ org.apache.lucene.search.TimeLimitingCollector#getGlobalCounter()
6161
java.util.concurrent.Future#cancel(boolean)
6262

6363
@defaultMessage Don't try reading from paths that are not configured in Environment, resolve from Environment instead
64-
org.elasticsearch.common.io.PathUtils#get(java.lang.String, java.lang.String[])
65-
org.elasticsearch.common.io.PathUtils#get(java.net.URI)
64+
org.elasticsearch.core.PathUtils#get(java.lang.String, java.lang.String[])
65+
org.elasticsearch.core.PathUtils#get(java.net.URI)
6666

6767
@defaultMessage Constructing a DateTime without a time zone is dangerous
6868
org.joda.time.DateTime#<init>()

client/benchmark/src/main/java/org/elasticsearch/client/benchmark/AbstractBenchmark.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
import org.elasticsearch.client.benchmark.ops.bulk.BulkRequestExecutor;
1212
import org.elasticsearch.client.benchmark.ops.search.SearchBenchmarkTask;
1313
import org.elasticsearch.client.benchmark.ops.search.SearchRequestExecutor;
14-
import org.elasticsearch.common.SuppressForbidden;
14+
import org.elasticsearch.core.SuppressForbidden;
1515

1616
import java.io.Closeable;
1717
import java.lang.management.GarbageCollectorMXBean;

client/benchmark/src/main/java/org/elasticsearch/client/benchmark/BenchmarkMain.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
package org.elasticsearch.client.benchmark;
99

1010
import org.elasticsearch.client.benchmark.rest.RestClientBenchmark;
11-
import org.elasticsearch.common.SuppressForbidden;
11+
import org.elasticsearch.core.SuppressForbidden;
1212

1313
import java.util.Arrays;
1414

client/benchmark/src/main/java/org/elasticsearch/client/benchmark/BenchmarkRunner.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
import org.elasticsearch.client.benchmark.metrics.MetricsCalculator;
1212
import org.elasticsearch.client.benchmark.metrics.Sample;
1313
import org.elasticsearch.client.benchmark.metrics.SampleRecorder;
14-
import org.elasticsearch.common.SuppressForbidden;
14+
import org.elasticsearch.core.SuppressForbidden;
1515

1616
import java.util.Arrays;
1717
import java.util.List;

client/benchmark/src/main/java/org/elasticsearch/client/benchmark/ops/bulk/BulkBenchmarkTask.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313
import org.elasticsearch.client.benchmark.BenchmarkTask;
1414
import org.elasticsearch.client.benchmark.metrics.Sample;
1515
import org.elasticsearch.client.benchmark.metrics.SampleRecorder;
16-
import org.elasticsearch.common.SuppressForbidden;
17-
import org.elasticsearch.common.io.PathUtils;
16+
import org.elasticsearch.core.SuppressForbidden;
17+
import org.elasticsearch.core.PathUtils;
1818

1919
import java.io.BufferedReader;
2020
import java.io.IOException;

client/rest-high-level/src/main/java/org/elasticsearch/client/GeoIpStatsResponse.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
package org.elasticsearch.client;
1010

1111
import org.elasticsearch.common.ParseField;
12-
import org.elasticsearch.common.collect.Tuple;
12+
import org.elasticsearch.core.Tuple;
1313
import org.elasticsearch.common.xcontent.ConstructingObjectParser;
1414
import org.elasticsearch.common.xcontent.ToXContentObject;
1515
import org.elasticsearch.common.xcontent.XContentBuilder;

0 commit comments

Comments
 (0)