Merge branch 'stable-3.0' into stable-3.1
* stable-3.0:
Do not broadcast accounts_byname and accounts_byemail
Change-Id: Id09f79735321e9902ad259342b277d74774b3313
diff --git a/src/main/java/com/googlesource/gerrit/plugins/multisite/cache/CachePatternMatcher.java b/src/main/java/com/googlesource/gerrit/plugins/multisite/cache/CachePatternMatcher.java
index cd86848..acf8df0 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/multisite/cache/CachePatternMatcher.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/multisite/cache/CachePatternMatcher.java
@@ -27,7 +27,7 @@
class CachePatternMatcher {
private static final List<String> DEFAULT_PATTERNS =
ImmutableList.of(
- "^accounts.*", "^groups.*", "ldap_groups", "ldap_usernames", "projects", "sshkeys");
+ "accounts", "^groups.*", "ldap_groups", "ldap_usernames", "projects", "sshkeys");
private final Pattern pattern;
diff --git a/src/test/java/com/googlesource/gerrit/plugins/multisite/cache/CachePattenMatcherTest.java b/src/test/java/com/googlesource/gerrit/plugins/multisite/cache/CachePattenMatcherTest.java
index d2c6ff2..052a9ae 100644
--- a/src/test/java/com/googlesource/gerrit/plugins/multisite/cache/CachePattenMatcherTest.java
+++ b/src/test/java/com/googlesource/gerrit/plugins/multisite/cache/CachePattenMatcherTest.java
@@ -38,8 +38,6 @@
for (String cache :
ImmutableList.of(
"accounts",
- "accounts_byemail",
- "accounts_byname",
"groups",
"groups_byinclude",
"groups_byname",
diff --git a/src/test/java/com/googlesource/gerrit/plugins/multisite/forwarder/CacheEntryTest.java b/src/test/java/com/googlesource/gerrit/plugins/multisite/forwarder/CacheEntryTest.java
index 7328c8b..1a9172a 100644
--- a/src/test/java/com/googlesource/gerrit/plugins/multisite/forwarder/CacheEntryTest.java
+++ b/src/test/java/com/googlesource/gerrit/plugins/multisite/forwarder/CacheEntryTest.java
@@ -16,19 +16,13 @@
import static com.google.common.truth.Truth.assertThat;
-import com.googlesource.gerrit.plugins.multisite.cache.Constants;
import org.junit.Test;
public class CacheEntryTest {
@Test
public void cacheEntry() throws Exception {
- CacheEntry entry = CacheEntry.from("accounts_by_name", "someKey");
- assertThat(entry.getPluginName()).isEqualTo(Constants.GERRIT);
- assertThat(entry.getCacheName()).isEqualTo("accounts_by_name");
- assertThat(entry.getKey()).isEqualTo("someKey");
-
- entry = CacheEntry.from("my_plugin.my_cache", "someOtherKey");
+ CacheEntry entry = CacheEntry.from("my_plugin.my_cache", "someOtherKey");
assertThat(entry.getPluginName()).isEqualTo("my_plugin");
assertThat(entry.getCacheName()).isEqualTo("my_cache");
assertThat(entry.getKey()).isEqualTo("someOtherKey");