Remove plugin name from logs message
The log messages already contain the plugin package name and thus do
not need any extra artificial labelling as prefix in their messages.
Change-Id: I00c17db04e3d5f0eca801100d3dbe40bf9a92741
diff --git a/src/main/java/com/googlesource/gerrit/plugins/multisite/cache/CacheEvictionHandler.java b/src/main/java/com/googlesource/gerrit/plugins/multisite/cache/CacheEvictionHandler.java
index 31c79a2..77c19c1 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/multisite/cache/CacheEvictionHandler.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/multisite/cache/CacheEvictionHandler.java
@@ -15,7 +15,6 @@
package com.googlesource.gerrit.plugins.multisite.cache;
import com.google.common.cache.RemovalNotification;
-import com.google.gerrit.extensions.annotations.PluginName;
import com.google.gerrit.extensions.registration.DynamicSet;
import com.google.gerrit.server.cache.CacheRemovalListener;
import com.google.inject.Inject;
@@ -27,18 +26,15 @@
class CacheEvictionHandler<K, V> implements CacheRemovalListener<K, V> {
private final Executor executor;
private final DynamicSet<CacheEvictionForwarder> forwarders;
- private final String pluginName;
private final CachePatternMatcher matcher;
@Inject
CacheEvictionHandler(
DynamicSet<CacheEvictionForwarder> forwarders,
@CacheExecutor Executor executor,
- @PluginName String pluginName,
CachePatternMatcher matcher) {
this.forwarders = forwarders;
this.executor = executor;
- this.pluginName = pluginName;
this.matcher = matcher;
}
@@ -64,8 +60,8 @@
@Override
public String toString() {
return String.format(
- "[%s] Evict key '%s' from cache '%s' in target instance",
- pluginName, cacheEvictionEvent.key, cacheEvictionEvent.cacheName);
+ "Evict key '%s' from cache '%s' in target instance",
+ cacheEvictionEvent.key, cacheEvictionEvent.cacheName);
}
}
}
diff --git a/src/main/java/com/googlesource/gerrit/plugins/multisite/cache/ProjectListUpdateHandler.java b/src/main/java/com/googlesource/gerrit/plugins/multisite/cache/ProjectListUpdateHandler.java
index 36de1bb..5723fbe 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/multisite/cache/ProjectListUpdateHandler.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/multisite/cache/ProjectListUpdateHandler.java
@@ -14,7 +14,6 @@
package com.googlesource.gerrit.plugins.multisite.cache;
-import com.google.gerrit.extensions.annotations.PluginName;
import com.google.gerrit.extensions.events.NewProjectCreatedListener;
import com.google.gerrit.extensions.events.ProjectDeletedListener;
import com.google.gerrit.extensions.events.ProjectEvent;
@@ -31,16 +30,12 @@
private final DynamicSet<ProjectListUpdateForwarder> forwarders;
private final Executor executor;
- private final String pluginName;
@Inject
public ProjectListUpdateHandler(
- DynamicSet<ProjectListUpdateForwarder> forwarders,
- @CacheExecutor Executor executor,
- @PluginName String pluginName) {
+ DynamicSet<ProjectListUpdateForwarder> forwarders, @CacheExecutor Executor executor) {
this.forwarders = forwarders;
this.executor = executor;
- this.pluginName = pluginName;
}
@Override
@@ -77,10 +72,8 @@
@Override
public String toString() {
return String.format(
- "[%s] Update project list in target instance: %s '%s'",
- pluginName,
- projectListUpdateEvent.remove ? "remove" : "add",
- projectListUpdateEvent.projectName);
+ "Update project list in target instance: %s '%s'",
+ projectListUpdateEvent.remove ? "remove" : "add", projectListUpdateEvent.projectName);
}
}
}
diff --git a/src/main/java/com/googlesource/gerrit/plugins/multisite/event/EventHandler.java b/src/main/java/com/googlesource/gerrit/plugins/multisite/event/EventHandler.java
index 977cdae..aafd59f 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/multisite/event/EventHandler.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/multisite/event/EventHandler.java
@@ -14,7 +14,6 @@
package com.googlesource.gerrit.plugins.multisite.event;
-import com.google.gerrit.extensions.annotations.PluginName;
import com.google.gerrit.extensions.registration.DynamicSet;
import com.google.gerrit.server.events.Event;
import com.google.gerrit.server.events.EventListener;
@@ -27,16 +26,11 @@
class EventHandler implements EventListener {
private final Executor executor;
private final DynamicSet<StreamEventForwarder> forwarders;
- private final String pluginName;
@Inject
- EventHandler(
- DynamicSet<StreamEventForwarder> forwarders,
- @EventExecutor Executor executor,
- @PluginName String pluginName) {
+ EventHandler(DynamicSet<StreamEventForwarder> forwarders, @EventExecutor Executor executor) {
this.forwarders = forwarders;
this.executor = executor;
- this.pluginName = pluginName;
}
@Override
@@ -60,7 +54,7 @@
@Override
public String toString() {
- return String.format("[%s] Send event '%s' to target instance", pluginName, event.type);
+ return String.format("Send event '%s' to target instance", event.type);
}
}
}
diff --git a/src/main/java/com/googlesource/gerrit/plugins/multisite/index/IndexEventHandler.java b/src/main/java/com/googlesource/gerrit/plugins/multisite/index/IndexEventHandler.java
index 9bef6fb..ee3ddbc 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/multisite/index/IndexEventHandler.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/multisite/index/IndexEventHandler.java
@@ -15,7 +15,6 @@
package com.googlesource.gerrit.plugins.multisite.index;
import com.google.common.base.Objects;
-import com.google.gerrit.extensions.annotations.PluginName;
import com.google.gerrit.extensions.events.AccountIndexedListener;
import com.google.gerrit.extensions.events.ChangeIndexedListener;
import com.google.gerrit.extensions.events.GroupIndexedListener;
@@ -43,19 +42,16 @@
private static final Logger log = LoggerFactory.getLogger(IndexEventHandler.class);
private final Executor executor;
private final DynamicSet<IndexEventForwarder> forwarders;
- private final String pluginName;
private final Set<IndexTask> queuedTasks = Collections.newSetFromMap(new ConcurrentHashMap<>());
private final ChangeCheckerImpl.Factory changeChecker;
@Inject
IndexEventHandler(
@IndexExecutor Executor executor,
- @PluginName String pluginName,
DynamicSet<IndexEventForwarder> forwarders,
ChangeCheckerImpl.Factory changeChecker) {
this.forwarders = forwarders;
this.executor = executor;
- this.pluginName = pluginName;
this.changeChecker = changeChecker;
}
@@ -164,8 +160,7 @@
@Override
public String toString() {
- return String.format(
- "[%s] Index change %s in target instance", pluginName, changeIndexEvent.changeId);
+ return String.format("Index change %s in target instance", changeIndexEvent.changeId);
}
}
@@ -196,8 +191,7 @@
@Override
public String toString() {
- return String.format(
- "[%s] Index account %s in target instance", pluginName, accountIndexEvent.accountId);
+ return String.format("Index account %s in target instance", accountIndexEvent.accountId);
}
}
@@ -228,8 +222,7 @@
@Override
public String toString() {
- return String.format(
- "[%s] Index group %s in target instance", pluginName, groupIndexEvent.groupUUID);
+ return String.format("Index group %s in target instance", groupIndexEvent.groupUUID);
}
}
@@ -260,8 +253,7 @@
@Override
public String toString() {
- return String.format(
- "[%s] Index project %s in target instance", pluginName, projectIndexEvent.projectName);
+ return String.format("Index project %s in target instance", projectIndexEvent.projectName);
}
}
}
diff --git a/src/test/java/com/googlesource/gerrit/plugins/multisite/cache/ProjectListUpdateHandlerTest.java b/src/test/java/com/googlesource/gerrit/plugins/multisite/cache/ProjectListUpdateHandlerTest.java
index b2cc686..bf4b4cf 100644
--- a/src/test/java/com/googlesource/gerrit/plugins/multisite/cache/ProjectListUpdateHandlerTest.java
+++ b/src/test/java/com/googlesource/gerrit/plugins/multisite/cache/ProjectListUpdateHandlerTest.java
@@ -36,7 +36,6 @@
@RunWith(MockitoJUnitRunner.class)
public class ProjectListUpdateHandlerTest {
- private static final String PLUGIN_NAME = "multi-site";
private ProjectListUpdateHandler handler;
@@ -44,9 +43,7 @@
@Before
public void setUp() {
- handler =
- new ProjectListUpdateHandler(
- asDynamicSet(forwarder), MoreExecutors.directExecutor(), PLUGIN_NAME);
+ handler = new ProjectListUpdateHandler(asDynamicSet(forwarder), MoreExecutors.directExecutor());
}
private DynamicSet<ProjectListUpdateForwarder> asDynamicSet(
@@ -89,15 +86,11 @@
ProjectListUpdateTask task =
handler.new ProjectListUpdateTask(new ProjectListUpdateEvent(projectName, false));
assertThat(task.toString())
- .isEqualTo(
- String.format(
- "[%s] Update project list in target instance: add '%s'", PLUGIN_NAME, projectName));
+ .isEqualTo(String.format("Update project list in target instance: add '%s'", projectName));
task = handler.new ProjectListUpdateTask(new ProjectListUpdateEvent(projectName, true));
assertThat(task.toString())
.isEqualTo(
- String.format(
- "[%s] Update project list in target instance: remove '%s'",
- PLUGIN_NAME, projectName));
+ String.format("Update project list in target instance: remove '%s'", projectName));
}
}
diff --git a/src/test/java/com/googlesource/gerrit/plugins/multisite/event/EventHandlerTest.java b/src/test/java/com/googlesource/gerrit/plugins/multisite/event/EventHandlerTest.java
index bbef652..990a03f 100644
--- a/src/test/java/com/googlesource/gerrit/plugins/multisite/event/EventHandlerTest.java
+++ b/src/test/java/com/googlesource/gerrit/plugins/multisite/event/EventHandlerTest.java
@@ -35,7 +35,6 @@
@RunWith(MockitoJUnitRunner.class)
public class EventHandlerTest {
- private static final String PLUGIN_NAME = "multi-site";
private EventHandler eventHandler;
@@ -43,8 +42,7 @@
@Before
public void setUp() {
- eventHandler =
- new EventHandler(asDynamicSet(forwarder), MoreExecutors.directExecutor(), PLUGIN_NAME);
+ eventHandler = new EventHandler(asDynamicSet(forwarder), MoreExecutors.directExecutor());
}
private DynamicSet<StreamEventForwarder> asDynamicSet(StreamEventForwarder forwarder) {
@@ -79,7 +77,6 @@
Event event = new RefUpdatedEvent();
EventTask task = eventHandler.new EventTask(event);
assertThat(task.toString())
- .isEqualTo(
- String.format("[%s] Send event '%s' to target instance", PLUGIN_NAME, event.type));
+ .isEqualTo(String.format("Send event '%s' to target instance", event.type));
}
}
