Plugins: Remove name() and description() from api

In 2.0 we added plugin descriptors which require defining a name and
description for the plugin. However, we still have name() and
description() which must be overriden from the Plugin class. This still
exists for classpath plugins. But classpath plugins are mainly for
tests, and even then, referring to classpath plugins with their class is
a better idea. This change removes name() and description(), replacing
the name for classpath plugins with the full class name.

2 files changed, 0 insertions, 18 deletions

diff --git a/plugins/repository-azure/src/main/java/org/elasticsearch/plugin/repository/azure/AzureRepositoryPlugin.java b/plugins/repository-azure/src/main/java/org/elasticsearch/plugin/repository/azure/AzureRepositoryPlugin.java
index 3ce043500a..56b50322c9 100644
--- a/plugins/repository-azure/src/main/java/org/elasticsearch/plugin/repository/azure/AzureRepositoryPlugin.java
+++ b/plugins/repository-azure/src/main/java/org/elasticsearch/plugin/repository/azure/AzureRepositoryPlugin.java
@@ -48,16 +48,6 @@ public class AzureRepositoryPlugin extends Plugin {
     }
 
     @Override
-    public String name() {
-        return "repository-azure";
-    }
-
-    @Override
-    public String description() {
-        return "Azure Repository Plugin";
-    }
-
-    @Override
     public Collection<Module> nodeModules() {
         return Collections.singletonList((Module) new AzureRepositoryModule(settings));
     }
diff --git a/plugins/repository-azure/src/test/java/org/elasticsearch/cloud/azure/AbstractAzureRepositoryServiceIntegTestCase.java b/plugins/repository-azure/src/test/java/org/elasticsearch/cloud/azure/AbstractAzureRepositoryServiceIntegTestCase.java
index ae1bdd19a5..82af834cd3 100644
--- a/plugins/repository-azure/src/test/java/org/elasticsearch/cloud/azure/AbstractAzureRepositoryServiceIntegTestCase.java
+++ b/plugins/repository-azure/src/test/java/org/elasticsearch/cloud/azure/AbstractAzureRepositoryServiceIntegTestCase.java
@@ -41,14 +41,6 @@ import java.util.Collection;
 public abstract class AbstractAzureRepositoryServiceIntegTestCase extends AbstractAzureIntegTestCase {
 
     public static class TestPlugin extends Plugin {
-        @Override
-        public String name() {
-            return "mock-storage-service";
-        }
-        @Override
-        public String description() {
-            return "plugs in a mock storage service for testing";
-        }
         public void onModule(AzureRepositoryModule azureRepositoryModule) {
             AzureRepositoryModule.storageServiceImpl = AzureStorageServiceMock.class;
         }