Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Backport] Replace usages of XPackPlugin with the LocalStateCompositeXPackPlugin #49722

Merged
merged 1 commit into from
Nov 29, 2019
Merged

[Backport] Replace usages of XPackPlugin with the LocalStateCompositeXPackPlugin #49722

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions ...ics/src/test/java/org/elasticsearch/xpack/analytics/mapper/HistogramFieldMapperTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
import org.elasticsearch.plugins.Plugin;
import org.elasticsearch.test.ESSingleNodeTestCase;
import org.elasticsearch.xpack.analytics.AnalyticsPlugin;
import org.elasticsearch.xpack.core.XPackPlugin;
import org.elasticsearch.xpack.core.LocalStateCompositeXPackPlugin;

import java.util.ArrayList;
import java.util.Collection;
Expand Down Expand Up @@ -502,7 +502,7 @@ public void testNegativeCount() throws Exception {
protected Collection<Class<? extends Plugin>> getPlugins() {
List<Class<? extends Plugin>> plugins = new ArrayList<>(super.getPlugins());
plugins.add(AnalyticsPlugin.class);
plugins.add(XPackPlugin.class);
plugins.add(LocalStateCompositeXPackPlugin.class);
return plugins;
}

Expand Down
5 changes: 2 additions & 3 deletions ...st/java/org/elasticsearch/xpack/analytics/mapper/HistogramPercentileAggregationTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
import org.elasticsearch.search.aggregations.metrics.TDigestState;
import org.elasticsearch.test.ESSingleNodeTestCase;
import org.elasticsearch.xpack.analytics.AnalyticsPlugin;
import org.elasticsearch.xpack.core.XPackPlugin;
import org.elasticsearch.xpack.core.LocalStateCompositeXPackPlugin;

import java.util.ArrayList;
import java.util.Collection;
Expand Down Expand Up @@ -225,12 +225,11 @@ public void testTDigestHistogram() throws Exception {
}
}


@Override
protected Collection<Class<? extends Plugin>> getPlugins() {
List<Class<? extends Plugin>> plugins = new ArrayList<>(super.getPlugins());
plugins.add(AnalyticsPlugin.class);
plugins.add(XPackPlugin.class);
plugins.add(LocalStateCompositeXPackPlugin.class);
return plugins;
}

Expand Down