Merge branch 'master' into enhancement/rollover_api

Original commit: elastic/x-pack-elasticsearch@0217fa2a12

elasticsearch/x-pack/graph/src/main/java/org/elasticsearch/xpack/graph/Graph.java

@@ -34,16 +34,6 @@ public class Graph extends Plugin {
         enabled = enabled(settings);
     }
     
-    @Override
-    public String name() {
-        return NAME;
-    }
-
-    @Override
-    public String description() {
-        return "Elasticsearch Graph Plugin";
-    }
-    
     public static boolean enabled(Settings settings) {
         return XPackPlugin.featureEnabled(settings, NAME, true);
     }

elasticsearch/x-pack/graph/src/test/java/org/elasticsearch/xpack/graph/test/GraphTests.java

@@ -350,16 +350,6 @@ public class GraphTests extends ESSingleNodeTestCase {
     }
 
     public static class ScriptedTimeoutPlugin extends Plugin implements ScriptPlugin {
-        @Override
-        public String name() {
-            return "test-scripted-graph-timeout";
-        }
-
-        @Override
-        public String description() {
-            return "Test for scripted timeouts on graph searches";
-        }
-
         @Override
         public List<NativeScriptFactory> getNativeScripts() {
             return Collections.singletonList(new NativeTestScriptedTimeout.Factory());

elasticsearch/x-pack/license-plugin/src/test/java/org/elasticsearch/license/plugin/consumer/EagerLicenseRegistrationConsumerPlugin.java

@@ -28,11 +28,6 @@ public class EagerLicenseRegistrationConsumerPlugin extends TestConsumerPluginBa
         return EagerLicenseRegistrationPluginService.class;
     }
 
-    @Override
-    protected String pluginName() {
-        return NAME;
-    }
-
     @Override
     public String id() {
         return EagerLicenseRegistrationPluginService.ID;

elasticsearch/x-pack/license-plugin/src/test/java/org/elasticsearch/license/plugin/consumer/LazyLicenseRegistrationConsumerPlugin.java

@@ -16,8 +16,6 @@ import org.elasticsearch.common.settings.Settings;
  */
 public class LazyLicenseRegistrationConsumerPlugin extends TestConsumerPluginBase {
 
-    public static String NAME = "test_consumer_plugin_2";
-
     @Inject
     public LazyLicenseRegistrationConsumerPlugin(Settings settings) {
         super(settings);
@@ -28,11 +26,6 @@ public class LazyLicenseRegistrationConsumerPlugin extends TestConsumerPluginBas
         return LazyLicenseRegistrationPluginService.class;
     }
 
-    @Override
-    protected String pluginName() {
-        return NAME;
-    }
-
     @Override
     public String id() {
         return LazyLicenseRegistrationPluginService.ID;

elasticsearch/x-pack/license-plugin/src/test/java/org/elasticsearch/license/plugin/consumer/TestConsumerPluginBase.java

@@ -26,17 +26,6 @@ public abstract class TestConsumerPluginBase extends Plugin {
         this.isEnabled = TransportClient.CLIENT_TYPE.equals(settings.get(Client.CLIENT_TYPE_SETTING_S.getKey())) == false;
     }
 
-    @Override
-    public String name() {
-        return pluginName();
-    }
-
-    @Override
-    public String description() {
-        return "test licensing consumer plugin";
-    }
-
-
     @Override
     public Collection<Class<? extends LifecycleComponent>> nodeServices() {
         Collection<Class<? extends LifecycleComponent>> services = new ArrayList<>();
@@ -55,7 +44,5 @@ public abstract class TestConsumerPluginBase extends Plugin {
 
     public abstract Class<? extends TestPluginServiceBase> service();
 
-    protected abstract String pluginName();
-
     public abstract String id();
 }

elasticsearch/x-pack/marvel/src/test/java/org/elasticsearch/marvel/MarvelPluginTests.java

@@ -79,7 +79,7 @@ public class MarvelPluginTests extends MarvelIntegTestCase {
             for (PluginInfo plugin : nodeInfo.getPlugins().getPluginInfos()) {
                 assertNotNull(plugin);
 
-                if (XPackPlugin.NAME.equals(plugin.getName())) {
+                if (XPackPlugin.class.getName().equals(plugin.getName())) {
                     found = true;
                     break;
                 }

elasticsearch/x-pack/shield/src/main/java/org/elasticsearch/shield/support/Exceptions.java

@@ -19,13 +19,13 @@ public class Exceptions {
 
     public static ElasticsearchSecurityException authenticationError(String msg, Throwable cause, Object... args) {
         ElasticsearchSecurityException e = new ElasticsearchSecurityException(msg, RestStatus.UNAUTHORIZED, cause, args);
-        e.addHeader("WWW-Authenticate", "Basic realm=\"" + Security.NAME + "\"");
+        e.addHeader("WWW-Authenticate", "Basic realm=\"" + Security.NAME + "\" charset=\"UTF-8\"");
         return e;
     }
 
     public static ElasticsearchSecurityException authenticationError(String msg, Object... args) {
         ElasticsearchSecurityException e = new ElasticsearchSecurityException(msg, RestStatus.UNAUTHORIZED, args);
-        e.addHeader("WWW-Authenticate", "Basic realm=\"" + Security.NAME + "\"");
+        e.addHeader("WWW-Authenticate", "Basic realm=\"" + Security.NAME + "\" charset=\"UTF-8\"");
         return e;
     }
 

elasticsearch/x-pack/shield/src/test/java/org/elasticsearch/shield/test/ShieldAssertions.java

@@ -21,6 +21,6 @@ public class ShieldAssertions {
         assertThat(e.status(), is(RestStatus.UNAUTHORIZED));
         assertThat(e.getHeaderKeys(), hasSize(1));
         assertThat(e.getHeader("WWW-Authenticate"), notNullValue());
-        assertThat(e.getHeader("WWW-Authenticate"), contains("Basic realm=\"" + Security.NAME + "\""));
+        assertThat(e.getHeader("WWW-Authenticate"), contains("Basic realm=\"" + Security.NAME + "\" charset=\"UTF-8\""));
     }
 }

elasticsearch/x-pack/shield/src/test/java/org/elasticsearch/shield/transport/TransportFilterTests.java

@@ -116,16 +116,6 @@ public class TransportFilterTests extends ESIntegTestCase {
     }
 
     public static class InternalPlugin extends Plugin {
-        @Override
-        public String name() {
-            return "test-transport-filter";
-        }
-
-        @Override
-        public String description() {
-            return "";
-        }
-
         @Override
         public Collection<Module> nodeModules() {
             return Collections.<Module>singletonList(new TestTransportFilterModule());
@@ -289,14 +279,6 @@ public class TransportFilterTests extends ESIntegTestCase {
     // Sub class the Shield transport to always inject a mock for testing
     public static class InternalPluginServerTransportService extends ShieldServerTransportService {
         public static class TestPlugin extends Plugin {
-            @Override
-            public String name() {
-                return "mock-transport-service";
-            }
-            @Override
-            public String description() {
-                return "a mock transport service for testing";
-            }
             public void onModule(NetworkModule module) {
                 module.registerTransportService("filter-mock", InternalPluginServerTransportService.class);
             }

elasticsearch/x-pack/shield/src/test/java/org/elasticsearch/test/ShieldIntegTestCase.java

@@ -151,7 +151,8 @@ public abstract class ShieldIntegTestCase extends ESIntegTestCase {
 //            assertThat(nodeInfo.getPlugins().getInfos(), hasSize(2));
             Collection<String> pluginNames =
                     nodeInfo.getPlugins().getPluginInfos().stream().map(p -> p.getName()).collect(Collectors.toList());
-            assertThat("plugin [" + XPackPlugin.NAME + "] not found in [" + pluginNames + "]", pluginNames, hasItem(XPackPlugin.NAME));
+            assertThat("plugin [" + xpackPluginClass().getName() + "] not found in [" + pluginNames + "]", pluginNames,
+                hasItem(xpackPluginClass().getName()));
         }
     }
 

elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/XPackPlugin.java

@@ -127,14 +127,6 @@ public class XPackPlugin extends Plugin implements ScriptPlugin {
         }
     }
 
-    @Override public String name() {
-        return NAME;
-    }
-
-    @Override public String description() {
-        return "Elastic X-Pack";
-    }
-
     // For tests only
     public Collection<Class<? extends XPackExtension>> getExtensions() {
         return Collections.emptyList();

elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/script/MockMustacheScriptEngine.java

@@ -20,12 +20,6 @@ public class MockMustacheScriptEngine extends MockScriptEngine {
     public static final String NAME = "mustache";
 
     public static class TestPlugin extends MockScriptEngine.TestPlugin {
-
-        @Override
-        public String name() {
-            return NAME;
-        }
-
         @Override
         public ScriptEngineService getScriptEngineService(Settings settings) {
             return new MockMustacheScriptEngine();

elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/script/SleepScriptEngine.java

@@ -23,20 +23,6 @@ public class SleepScriptEngine implements ScriptEngineService {
     public static final String NAME = "sleep";
 
     public static class TestPlugin extends Plugin implements ScriptPlugin {
-
-        public TestPlugin() {
-        }
-
-        @Override
-        public String name() {
-            return NAME;
-        }
-
-        @Override
-        public String description() {
-            return "Mock script engine for integration tests";
-        }
-
         @Override
         public ScriptEngineService getScriptEngineService(Settings settings) {
             return new SleepScriptEngine();

elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/actions/ActionErrorIntegrationTests.java

@@ -112,19 +112,6 @@ public class ActionErrorIntegrationTests extends AbstractWatcherIntegrationTestC
 
     public static class ErrorActionPlugin extends Plugin {
 
-        public ErrorActionPlugin() {
-        }
-
-        @Override
-        public String name() {
-            return "error-action";
-        }
-
-        @Override
-        public String description() {
-            return name();
-        }
-
         public void onModule(WatcherActionModule module) {
             module.registerAction(ErrorAction.TYPE, ErrorAction.Factory.class);
         }

elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/support/WatcherIndexTemplateRegistryTests.java

@@ -76,14 +76,6 @@ public class WatcherIndexTemplateRegistryTests extends AbstractWatcherIntegratio
     }
 
     public static class SettingTestPlugin extends Plugin {
-        public String name() {
-            return "watcher-index-template-registry-settings-plugin";
-        }
-
-        @Override
-        public String description() {
-            return "installs a setting this test needs";
-        }
 
         public static final Setting<String> KEY_1 = new Setting<>("index.key1", "", Function.identity(), Setting.Property.IndexScope);