|
19 | 19 |
|
20 | 20 | package org.elasticsearch.plugins; |
21 | 21 |
|
22 | | -import org.elasticsearch.action.ActionModule; |
23 | 22 | import org.elasticsearch.bootstrap.BootstrapCheck; |
24 | 23 | import org.elasticsearch.client.Client; |
25 | | -import org.elasticsearch.cluster.ClusterModule; |
26 | 24 | import org.elasticsearch.cluster.ClusterState; |
27 | 25 | import org.elasticsearch.cluster.metadata.IndexMetaData; |
28 | 26 | import org.elasticsearch.cluster.metadata.IndexTemplateMetaData; |
|
32 | 30 | import org.elasticsearch.common.inject.Module; |
33 | 31 | import org.elasticsearch.common.io.stream.NamedWriteable; |
34 | 32 | import org.elasticsearch.common.io.stream.NamedWriteableRegistry; |
35 | | -import org.elasticsearch.common.network.NetworkModule; |
36 | 33 | import org.elasticsearch.common.settings.Setting; |
37 | 34 | import org.elasticsearch.common.settings.SettingUpgrader; |
38 | 35 | import org.elasticsearch.common.settings.Settings; |
39 | | -import org.elasticsearch.common.settings.SettingsModule; |
40 | 36 | import org.elasticsearch.common.xcontent.NamedXContentRegistry; |
41 | 37 | import org.elasticsearch.common.xcontent.XContentParser; |
42 | | -import org.elasticsearch.discovery.DiscoveryModule; |
43 | 38 | import org.elasticsearch.env.Environment; |
44 | 39 | import org.elasticsearch.env.NodeEnvironment; |
45 | 40 | import org.elasticsearch.index.IndexModule; |
46 | | -import org.elasticsearch.indices.analysis.AnalysisModule; |
47 | | -import org.elasticsearch.repositories.RepositoriesModule; |
48 | | -import org.elasticsearch.script.ScriptModule; |
49 | 41 | import org.elasticsearch.script.ScriptService; |
50 | | -import org.elasticsearch.search.SearchModule; |
51 | 42 | import org.elasticsearch.threadpool.ExecutorBuilder; |
52 | 43 | import org.elasticsearch.threadpool.ThreadPool; |
53 | 44 | import org.elasticsearch.watcher.ResourceWatcherService; |
|
77 | 68 | * <li>{@link SearchPlugin} |
78 | 69 | * <li>{@link ReloadablePlugin} |
79 | 70 | * </ul> |
80 | | - * <p>In addition to extension points this class also declares some {@code @Deprecated} {@code public final void onModule} methods. These |
81 | | - * methods should cause any extensions of {@linkplain Plugin} that used the pre-5.x style extension syntax to fail to build and point the |
82 | | - * plugin author at the new extension syntax. We hope that these make the process of upgrading a plugin from 2.x to 5.x only mildly painful. |
83 | 71 | */ |
84 | 72 | public abstract class Plugin implements Closeable { |
85 | 73 |
|
@@ -257,95 +245,4 @@ public List<ExecutorBuilder<?>> getExecutorBuilders(Settings settings) { |
257 | 245 | public void close() throws IOException { |
258 | 246 |
|
259 | 247 | } |
260 | | - |
261 | | - /** |
262 | | - * Old-style guice index level extension point. {@code @Deprecated} and {@code final} to act as a signpost for plugin authors upgrading |
263 | | - * from 2.x. |
264 | | - * |
265 | | - * @deprecated use #onIndexModule instead |
266 | | - */ |
267 | | - @Deprecated |
268 | | - public final void onModule(IndexModule indexModule) {} |
269 | | - |
270 | | - |
271 | | - /** |
272 | | - * Old-style guice settings extension point. {@code @Deprecated} and {@code final} to act as a signpost for plugin authors upgrading |
273 | | - * from 2.x. |
274 | | - * |
275 | | - * @deprecated use #getSettings and #getSettingsFilter instead |
276 | | - */ |
277 | | - @Deprecated |
278 | | - public final void onModule(SettingsModule settingsModule) {} |
279 | | - |
280 | | - /** |
281 | | - * Old-style guice scripting extension point. {@code @Deprecated} and {@code final} to act as a signpost for plugin authors upgrading |
282 | | - * from 2.x. |
283 | | - * |
284 | | - * @deprecated implement {@link ScriptPlugin} instead |
285 | | - */ |
286 | | - @Deprecated |
287 | | - public final void onModule(ScriptModule module) {} |
288 | | - |
289 | | - /** |
290 | | - * Old-style analysis extension point. {@code @Deprecated} and {@code final} to act as a signpost for plugin authors upgrading |
291 | | - * from 2.x. |
292 | | - * |
293 | | - * @deprecated implement {@link AnalysisPlugin} instead |
294 | | - */ |
295 | | - @Deprecated |
296 | | - public final void onModule(AnalysisModule module) {} |
297 | | - |
298 | | - /** |
299 | | - * Old-style action extension point. {@code @Deprecated} and {@code final} to act as a signpost for plugin authors upgrading |
300 | | - * from 2.x. |
301 | | - * |
302 | | - * @deprecated implement {@link ActionPlugin} instead |
303 | | - */ |
304 | | - @Deprecated |
305 | | - public final void onModule(ActionModule module) {} |
306 | | - |
307 | | - /** |
308 | | - * Old-style search extension point. {@code @Deprecated} and {@code final} to act as a signpost for plugin authors upgrading |
309 | | - * from 2.x. |
310 | | - * |
311 | | - * @deprecated implement {@link SearchPlugin} instead |
312 | | - */ |
313 | | - @Deprecated |
314 | | - public final void onModule(SearchModule module) {} |
315 | | - |
316 | | - /** |
317 | | - * Old-style network extension point. {@code @Deprecated} and {@code final} to act as a signpost for plugin authors upgrading |
318 | | - * from 2.x. |
319 | | - * |
320 | | - * @deprecated implement {@link NetworkPlugin} instead |
321 | | - */ |
322 | | - @Deprecated |
323 | | - public final void onModule(NetworkModule module) {} |
324 | | - |
325 | | - /** |
326 | | - * Old-style snapshot/restore extension point. {@code @Deprecated} and {@code final} to act as a signpost for plugin authors upgrading |
327 | | - * from 2.x. |
328 | | - * |
329 | | - * @deprecated implement {@link RepositoryPlugin} instead |
330 | | - */ |
331 | | - @Deprecated |
332 | | - public final void onModule(RepositoriesModule module) {} |
333 | | - |
334 | | - /** |
335 | | - * Old-style cluster extension point. {@code @Deprecated} and {@code final} to act as a signpost for plugin authors upgrading |
336 | | - * from 2.x. |
337 | | - * |
338 | | - * @deprecated implement {@link ClusterPlugin} instead |
339 | | - */ |
340 | | - @Deprecated |
341 | | - public final void onModule(ClusterModule module) {} |
342 | | - |
343 | | - /** |
344 | | - * Old-style discovery extension point. {@code @Deprecated} and {@code final} to act as a signpost for plugin authors upgrading |
345 | | - * from 2.x. |
346 | | - * |
347 | | - * @deprecated implement {@link DiscoveryPlugin} instead |
348 | | - */ |
349 | | - @Deprecated |
350 | | - public final void onModule(DiscoveryModule module) {} |
351 | 248 | } |
0 commit comments