Skip to content

Commit db8ed36

Browse files
authored
Move Nullable into core (#29341)
This moves the `Nullable` annotation into the elasticsearch-core project, so it may be used without relying entirely on the server jar. This will allow us to decouple more pieces to make them smaller. In addition, there were two different `Nullable` annotations, these have all been moved to the ES version rather than the inject version.
1 parent 5adfe2d commit db8ed36

File tree

11 files changed

+10
-47
lines changed

11 files changed

+10
-47
lines changed

server/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/status/SnapshotStatus.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
import org.elasticsearch.Version;
2323
import org.elasticsearch.cluster.SnapshotsInProgress.State;
2424
import org.elasticsearch.common.Strings;
25-
import org.elasticsearch.common.inject.internal.Nullable;
25+
import org.elasticsearch.common.Nullable;
2626
import org.elasticsearch.common.io.stream.StreamInput;
2727
import org.elasticsearch.common.io.stream.StreamOutput;
2828
import org.elasticsearch.common.io.stream.Streamable;

server/src/main/java/org/elasticsearch/action/search/ScrollIdForNode.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919

2020
package org.elasticsearch.action.search;
2121

22-
import org.elasticsearch.common.inject.internal.Nullable;
22+
import org.elasticsearch.common.Nullable;
2323

2424
class ScrollIdForNode {
2525
private final String node;

server/src/main/java/org/elasticsearch/common/inject/InjectorImpl.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
package org.elasticsearch.common.inject;
1818

1919
import org.elasticsearch.common.Classes;
20+
import org.elasticsearch.common.Nullable;
2021
import org.elasticsearch.common.inject.internal.Annotations;
2122
import org.elasticsearch.common.inject.internal.BindingImpl;
2223
import org.elasticsearch.common.inject.internal.Errors;
@@ -27,7 +28,6 @@
2728
import org.elasticsearch.common.inject.internal.LinkedBindingImpl;
2829
import org.elasticsearch.common.inject.internal.LinkedProviderBindingImpl;
2930
import org.elasticsearch.common.inject.internal.MatcherAndConverter;
30-
import org.elasticsearch.common.inject.internal.Nullable;
3131
import org.elasticsearch.common.inject.internal.Scoping;
3232
import org.elasticsearch.common.inject.internal.SourceProvider;
3333
import org.elasticsearch.common.inject.internal.ToStringBuilder;

server/src/main/java/org/elasticsearch/common/inject/internal/Join.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616

1717
package org.elasticsearch.common.inject.internal;
1818

19+
import org.elasticsearch.common.Nullable;
1920
import org.elasticsearch.common.util.CollectionUtils;
2021

2122
import java.io.IOException;

server/src/main/java/org/elasticsearch/common/inject/internal/Nullable.java

Lines changed: 0 additions & 38 deletions
This file was deleted.

server/src/main/java/org/elasticsearch/search/aggregations/bucket/composite/CompositeValuesSourceConfig.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919

2020
package org.elasticsearch.search.aggregations.bucket.composite;
2121

22-
import org.elasticsearch.common.inject.internal.Nullable;
22+
import org.elasticsearch.common.Nullable;
2323
import org.elasticsearch.index.mapper.MappedFieldType;
2424
import org.elasticsearch.search.DocValueFormat;
2525
import org.elasticsearch.search.aggregations.support.ValuesSource;

server/src/main/java/org/elasticsearch/search/aggregations/bucket/composite/SortedDocsProducer.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
import org.apache.lucene.search.Query;
2626
import org.apache.lucene.util.Bits;
2727
import org.apache.lucene.util.DocIdSetBuilder;
28-
import org.elasticsearch.common.inject.internal.Nullable;
28+
import org.elasticsearch.common.Nullable;
2929
import org.elasticsearch.search.aggregations.LeafBucketCollector;
3030

3131
import java.io.IOException;

server/src/main/java/org/elasticsearch/search/aggregations/bucket/histogram/DateHistogramAggregator.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
import org.apache.lucene.index.LeafReaderContext;
2222
import org.apache.lucene.index.SortedNumericDocValues;
2323
import org.apache.lucene.util.CollectionUtil;
24-
import org.elasticsearch.common.inject.internal.Nullable;
24+
import org.elasticsearch.common.Nullable;
2525
import org.elasticsearch.common.lease.Releasables;
2626
import org.elasticsearch.common.rounding.Rounding;
2727
import org.elasticsearch.common.util.LongHash;

server/src/main/java/org/elasticsearch/search/aggregations/bucket/histogram/HistogramAggregator.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121

2222
import org.apache.lucene.index.LeafReaderContext;
2323
import org.apache.lucene.util.CollectionUtil;
24-
import org.elasticsearch.common.inject.internal.Nullable;
24+
import org.elasticsearch.common.Nullable;
2525
import org.elasticsearch.common.lease.Releasables;
2626
import org.elasticsearch.common.util.LongHash;
2727
import org.elasticsearch.index.fielddata.SortedNumericDoubleValues;

0 commit comments

Comments
 (0)