Merge branch 'stable-2.14' into stable-2.15
* stable-2.14:
AbstractQueryAccountsTest: Add byDeletedAccount to ensure consistency
AbstractQueryGroupsTest: Add byDeletedGroup to achieve higher coverage
Elastic{Account,Group}Index: Move the static Logger right after class
Elastic{Account,Change,Group}Index: Make names/types explicitly private
{Account,Change,Group}Mapping: Set package-privacy
Change-Id: Ic16048bcdda3e2f5293089d13bd6e5e82a7cd943
diff --git a/gerrit-elasticsearch/src/main/java/com/google/gerrit/elasticsearch/ElasticAccountIndex.java b/gerrit-elasticsearch/src/main/java/com/google/gerrit/elasticsearch/ElasticAccountIndex.java
index 459f9a1..729cfe9 100644
--- a/gerrit-elasticsearch/src/main/java/com/google/gerrit/elasticsearch/ElasticAccountIndex.java
+++ b/gerrit-elasticsearch/src/main/java/com/google/gerrit/elasticsearch/ElasticAccountIndex.java
@@ -57,17 +57,17 @@
public class ElasticAccountIndex extends AbstractElasticIndex<Account.Id, AccountState>
implements AccountIndex {
- public static class AccountMapping {
- MappingProperties accounts;
+ private static final Logger log = LoggerFactory.getLogger(ElasticAccountIndex.class);
- public AccountMapping(Schema<AccountState> schema, ElasticQueryAdapter adapter) {
+ static class AccountMapping {
+ final MappingProperties accounts;
+
+ AccountMapping(Schema<AccountState> schema, ElasticQueryAdapter adapter) {
this.accounts = ElasticMapping.createMapping(schema, adapter);
}
}
- public static final String ACCOUNTS = "accounts";
-
- private static final Logger log = LoggerFactory.getLogger(ElasticAccountIndex.class);
+ private static final String ACCOUNTS = "accounts";
private final AccountMapping mapping;
private final Provider<AccountCache> accountCache;
diff --git a/gerrit-elasticsearch/src/main/java/com/google/gerrit/elasticsearch/ElasticChangeIndex.java b/gerrit-elasticsearch/src/main/java/com/google/gerrit/elasticsearch/ElasticChangeIndex.java
index eea6e42..7d70e80 100644
--- a/gerrit-elasticsearch/src/main/java/com/google/gerrit/elasticsearch/ElasticChangeIndex.java
+++ b/gerrit-elasticsearch/src/main/java/com/google/gerrit/elasticsearch/ElasticChangeIndex.java
@@ -84,9 +84,9 @@
private static final Logger log = LoggerFactory.getLogger(ElasticChangeIndex.class);
static class ChangeMapping {
- public MappingProperties changes;
- public MappingProperties openChanges;
- public MappingProperties closedChanges;
+ final MappingProperties changes;
+ final MappingProperties openChanges;
+ final MappingProperties closedChanges;
ChangeMapping(Schema<ChangeData> schema, ElasticQueryAdapter adapter) {
MappingProperties mapping = ElasticMapping.createMapping(schema, adapter);
@@ -96,10 +96,9 @@
}
}
- static final String CHANGES = "changes";
- static final String OPEN_CHANGES = "open_" + CHANGES;
- static final String CLOSED_CHANGES = "closed_" + CHANGES;
-
+ private static final String CHANGES = "changes";
+ private static final String OPEN_CHANGES = "open_" + CHANGES;
+ private static final String CLOSED_CHANGES = "closed_" + CHANGES;
private final ChangeMapping mapping;
private final Provider<ReviewDb> db;
private final ChangeData.Factory changeDataFactory;
diff --git a/gerrit-elasticsearch/src/main/java/com/google/gerrit/elasticsearch/ElasticGroupIndex.java b/gerrit-elasticsearch/src/main/java/com/google/gerrit/elasticsearch/ElasticGroupIndex.java
index b601779..72f7cc2 100644
--- a/gerrit-elasticsearch/src/main/java/com/google/gerrit/elasticsearch/ElasticGroupIndex.java
+++ b/gerrit-elasticsearch/src/main/java/com/google/gerrit/elasticsearch/ElasticGroupIndex.java
@@ -56,17 +56,17 @@
public class ElasticGroupIndex extends AbstractElasticIndex<AccountGroup.UUID, InternalGroup>
implements GroupIndex {
+ private static final Logger log = LoggerFactory.getLogger(ElasticGroupIndex.class);
+
static class GroupMapping {
- MappingProperties groups;
+ final MappingProperties groups;
GroupMapping(Schema<InternalGroup> schema, ElasticQueryAdapter adapter) {
this.groups = ElasticMapping.createMapping(schema, adapter);
}
}
- public static final String GROUPS = "groups";
-
- private static final Logger log = LoggerFactory.getLogger(ElasticGroupIndex.class);
+ private static final String GROUPS = "groups";
private final GroupMapping mapping;
private final Provider<GroupCache> groupCache;
