opendev/gerrit
Code Issues Proposed changes

Merge branch 'stable-2.15'

Browse Source 
* stable-2.15:
  Update git submodules
  Reformat all Java files with google-java-format 1.6
  Reformat all Java files with google-java-format 1.6
  ChangeNotesTest: Have at most one call after ExpectedException#expect
  FieldType: Remove unnecessary KEYWORD type
  Remove unnecessary annotations from reindex test classes
  AbstractReindexTests: Assert account index and group index
  AbstractElasticIndex: Rename getActions to getDeleteActions
  dev-bazel: Improve documentation of build caches
  Hoist declaration of TestName up to GerritBaseTests
  Bazel: Replace native {http,git}_archive with Skylark rules
  Bazel: Bump rules_closure to 0.7.0
  dev-contributing: Update link to buildifier tool
  dev-contributing: Update buildifier to latest released version
  Bump minimum Bazel version to 0.14.0 and activate caches
  ElasticReindexIT: Add tests against Elasticsearch version 5
  Elasticsearch: Add tests for queries against version 5
  MatchQueryBuilder: Don't use deprecated "match" query
  Elasticsearch: Add an adapter to support V5
  Add Bazel version check

Change-Id: I6bbf229b76790f3fbb74a952d4330ba92e3dd449
This commit is contained in:
David Pursehouse
2018-06-06 11:55:54 +09:00
parent 925528b840 c65850775c
commit acb1889028
33 changed files with 546 additions and 265 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
java/com/google/gerrit/server/index/group/GroupField.java
View File

@@ -18,7 +18,6 @@ import static com.google.common.collect.ImmutableList.toImmutableList;
import static com.google.gerrit.index.FieldDef.exact;
import static com.google.gerrit.index.FieldDef.fullText;
import static com.google.gerrit.index.FieldDef.integer;
import static com.google.gerrit.index.FieldDef.keyword;
import static com.google.gerrit.index.FieldDef.prefix;
import static com.google.gerrit.index.FieldDef.storedOnly;
import static com.google.gerrit.index.FieldDef.timestamp;
@@ -41,11 +40,11 @@ public class GroupField {
/** Group UUID. */
public static final FieldDef<InternalGroup, String> UUID =
keyword("uuid").stored().build(g -> g.getGroupUUID().get());
exact("uuid").stored().build(g -> g.getGroupUUID().get());
/** Group owner UUID. */
public static final FieldDef<InternalGroup, String> OWNER_UUID =
keyword("owner_uuid").build(g -> g.getOwnerGroupUUID().get());
exact("owner_uuid").build(g -> g.getOwnerGroupUUID().get());
/** Timestamp indicating when this group was created. */
public static final FieldDef<InternalGroup, Timestamp> CREATED_ON =