Remove @ItsName and replace it by @PluginName Implementations of hooks-its must now define the plugin name. Change-Id: I0d0ec5c42836acbb4dd6a86eec03c0904a4bce85 Signed-off-by: Edwin Kempin <edwin.kempin@sap.com>

diff --git a/hooks-its/src/main/java/com/googlesource/gerrit/plugins/hooks/ItsHookModule.java b/hooks-its/src/main/java/com/googlesource/gerrit/plugins/hooks/ItsHookModule.java
index b25d240..95c3e2c 100644
--- a/hooks-its/src/main/java/com/googlesource/gerrit/plugins/hooks/ItsHookModule.java
+++ b/hooks-its/src/main/java/com/googlesource/gerrit/plugins/hooks/ItsHookModule.java

@@ -18,7 +18,7 @@
 import com.google.gerrit.extensions.registration.DynamicSet;
 import com.google.gerrit.server.config.FactoryModule;
 import com.google.gerrit.server.git.validators.CommitValidationListener;
-import com.googlesource.gerrit.plugins.hooks.its.ItsName;
+
 import com.googlesource.gerrit.plugins.hooks.validation.ItsValidateComment;
 import com.googlesource.gerrit.plugins.hooks.workflow.ActionRequest;
 import com.googlesource.gerrit.plugins.hooks.workflow.Condition;
@@ -36,15 +36,8 @@
 
 public class ItsHookModule extends FactoryModule {
 
-  private String itsName;
-
-  public ItsHookModule(String itsName) {
-    this.itsName = itsName;
-  }
-
   @Override
   protected void configure() {
-    bind(String.class).annotatedWith(ItsName.class).toInstance(itsName);
     DynamicSet.bind(binder(), ChangeListener.class).to(
         GerritHookFilterAddRelatedLinkToChangeId.class);
     DynamicSet.bind(binder(), ChangeListener.class).to(

diff --git a/hooks-its/src/main/java/com/googlesource/gerrit/plugins/hooks/its/ItsName.java b/hooks-its/src/main/java/com/googlesource/gerrit/plugins/hooks/its/ItsName.java
deleted file mode 100644
index 55f49e6..0000000
--- a/hooks-its/src/main/java/com/googlesource/gerrit/plugins/hooks/its/ItsName.java
+++ /dev/null

@@ -1,26 +0,0 @@
-// Copyright (C) 2013 The Android Open Source Project
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package com.googlesource.gerrit.plugins.hooks.its;
-
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-
-import java.lang.annotation.Retention;
-
-import com.google.inject.BindingAnnotation;
-
-@Retention(RUNTIME)
-@BindingAnnotation
-public @interface ItsName {
-}

diff --git a/hooks-its/src/main/java/com/googlesource/gerrit/plugins/hooks/util/IssueExtractor.java b/hooks-its/src/main/java/com/googlesource/gerrit/plugins/hooks/util/IssueExtractor.java
index ea8a788..b2ebbc4 100644
--- a/hooks-its/src/main/java/com/googlesource/gerrit/plugins/hooks/util/IssueExtractor.java
+++ b/hooks-its/src/main/java/com/googlesource/gerrit/plugins/hooks/util/IssueExtractor.java

@@ -7,14 +7,13 @@
 
 import com.google.common.collect.Maps;
 import com.google.common.collect.Sets;
+import com.google.gerrit.extensions.annotations.PluginName;
 import com.google.gerrit.reviewdb.client.PatchSet;
 import com.google.gerrit.reviewdb.server.ReviewDb;
 import com.google.gerrit.server.config.GerritServerConfig;
 import com.google.gwtorm.server.OrmException;
 import com.google.inject.Inject;
 
-import com.googlesource.gerrit.plugins.hooks.its.ItsName;
-
 import org.apache.commons.lang.StringUtils;
 import org.eclipse.jgit.lib.Config;
 
@@ -26,16 +25,16 @@
       IssueExtractor.class);
 
   private final Config gerritConfig;
-  private final String itsName;
+  private final String pluginName;
   private final CommitMessageFetcher commitMessageFetcher;
   private final ReviewDb db;
 
   @Inject
   IssueExtractor(@GerritServerConfig Config gerritConfig,
-      @ItsName String itsName, CommitMessageFetcher commitMessageFetcher,
+      @PluginName String pluginName, CommitMessageFetcher commitMessageFetcher,
       ReviewDb db) {
     this.gerritConfig = gerritConfig;
-    this.itsName = itsName;
+    this.pluginName = pluginName;
     this.commitMessageFetcher = commitMessageFetcher;
     this.db = db;
   }
@@ -70,7 +69,7 @@
    */
   public Pattern getPattern() {
     Pattern ret = null;
-    String match = gerritConfig.getString("commentLink", itsName, "match");
+    String match = gerritConfig.getString("commentLink", pluginName, "match");
     if (match != null) {
       ret = Pattern.compile(match);
     }

diff --git a/hooks-its/src/main/java/com/googlesource/gerrit/plugins/hooks/validation/ItsValidateComment.java b/hooks-its/src/main/java/com/googlesource/gerrit/plugins/hooks/validation/ItsValidateComment.java
index 984e9e8..ddc108d 100644
--- a/hooks-its/src/main/java/com/googlesource/gerrit/plugins/hooks/validation/ItsValidateComment.java
+++ b/hooks-its/src/main/java/com/googlesource/gerrit/plugins/hooks/validation/ItsValidateComment.java

@@ -25,14 +25,15 @@
 import org.slf4j.LoggerFactory;
 
 import com.google.common.collect.Lists;
+import com.google.gerrit.extensions.annotations.PluginName;
 import com.google.gerrit.server.config.GerritServerConfig;
 import com.google.gerrit.server.events.CommitReceivedEvent;
 import com.google.gerrit.server.git.validators.CommitValidationException;
 import com.google.gerrit.server.git.validators.CommitValidationListener;
 import com.google.gerrit.server.git.validators.CommitValidationMessage;
 import com.google.inject.Inject;
+
 import com.googlesource.gerrit.plugins.hooks.its.ItsFacade;
-import com.googlesource.gerrit.plugins.hooks.its.ItsName;
 import com.googlesource.gerrit.plugins.hooks.util.IssueExtractor;
 
 public class ItsValidateComment implements CommitValidationListener {
@@ -47,8 +48,8 @@
   @GerritServerConfig
   private Config gerritConfig;
 
-  @Inject @ItsName
-  private String itsName;
+  @Inject @PluginName
+  private String pluginName;
 
   @Inject
   private IssueExtractor issueExtractor;
@@ -131,7 +132,7 @@
   }
 
   private ItsAssociationPolicy getItsAssociationPolicy() {
-    return gerritConfig.getEnum("commentLink", itsName, "association",
+    return gerritConfig.getEnum("commentLink", pluginName, "association",
         ItsAssociationPolicy.OPTIONAL);
   }
 

diff --git a/hooks-its/src/test/java/com/googlesource/gerrit/plugins/hooks/util/IssueExtractorTest.java b/hooks-its/src/test/java/com/googlesource/gerrit/plugins/hooks/util/IssueExtractorTest.java
index 5d18b0c..e400a95 100644
--- a/hooks-its/src/test/java/com/googlesource/gerrit/plugins/hooks/util/IssueExtractorTest.java
+++ b/hooks-its/src/test/java/com/googlesource/gerrit/plugins/hooks/util/IssueExtractorTest.java

@@ -27,6 +27,7 @@
 
 import com.google.common.collect.Maps;
 import com.google.common.collect.Sets;
+import com.google.gerrit.extensions.annotations.PluginName;
 import com.google.gerrit.reviewdb.client.Change;
 import com.google.gerrit.reviewdb.client.PatchSet;
 import com.google.gerrit.reviewdb.client.RevId;
@@ -37,7 +38,7 @@
 import com.google.gwtorm.server.OrmException;
 import com.google.inject.Guice;
 import com.google.inject.Injector;
-import com.googlesource.gerrit.plugins.hooks.its.ItsName;
+
 import com.googlesource.gerrit.plugins.hooks.testutil.LoggingMockingTestCase;
 
 @RunWith(PowerMockRunner.class)
@@ -1163,7 +1164,7 @@
   private class TestModule extends FactoryModule {
     @Override
     protected void configure() {
-      bind(String.class).annotatedWith(ItsName.class)
+      bind(String.class).annotatedWith(PluginName.class)
           .toInstance("ItsTestName");
 
       serverConfig = createMock(Config.class);

diff --git a/hooks-its/src/test/java/com/googlesource/gerrit/plugins/hooks/validation/ItsValidateCommentTest.java b/hooks-its/src/test/java/com/googlesource/gerrit/plugins/hooks/validation/ItsValidateCommentTest.java
index 2421593..78eec51 100644
--- a/hooks-its/src/test/java/com/googlesource/gerrit/plugins/hooks/validation/ItsValidateCommentTest.java
+++ b/hooks-its/src/test/java/com/googlesource/gerrit/plugins/hooks/validation/ItsValidateCommentTest.java

@@ -28,7 +28,7 @@
 import org.powermock.core.classloader.annotations.PrepareForTest;
 import org.powermock.modules.junit4.PowerMockRunner;
 
-
+import com.google.gerrit.extensions.annotations.PluginName;
 import com.google.gerrit.server.config.FactoryModule;
 import com.google.gerrit.server.config.GerritServerConfig;
 import com.google.gerrit.server.events.CommitReceivedEvent;
@@ -38,7 +38,6 @@
 import com.google.inject.Injector;
 
 import com.googlesource.gerrit.plugins.hooks.its.ItsFacade;
-import com.googlesource.gerrit.plugins.hooks.its.ItsName;
 import com.googlesource.gerrit.plugins.hooks.testutil.LoggingMockingTestCase;
 import com.googlesource.gerrit.plugins.hooks.util.IssueExtractor;
 import com.googlesource.gerrit.plugins.hooks.validation.ItsAssociationPolicy;
@@ -499,7 +498,7 @@
   private class TestModule extends FactoryModule {
     @Override
     protected void configure() {
-      bind(String.class).annotatedWith(ItsName.class)
+      bind(String.class).annotatedWith(PluginName.class)
           .toInstance("ItsTestName");
 
       serverConfig = createMock(Config.class);