From 9750e9224de1ff1779c61bdb3339baf50b85b49c Mon Sep 17 00:00:00 2001 From: Edwin Kempin Date: Mon, 2 Jan 2017 11:26:21 +0100 Subject: [PATCH] Add initial GroupQueryBuilder and define key predicate for group index Change-Id: I4e367d6b9417343524d9dcd91a55728b72d5d5b1 Signed-off-by: Edwin Kempin --- .../gerrit/server/index/group/GroupIndex.java | 7 ++++ .../server/query/group/GroupPredicates.java | 41 +++++++++++++++++++ .../server/query/group/GroupQueryBuilder.java | 40 ++++++++++++++++++ 3 files changed, 88 insertions(+) create mode 100644 gerrit-server/src/main/java/com/google/gerrit/server/query/group/GroupPredicates.java create mode 100644 gerrit-server/src/main/java/com/google/gerrit/server/query/group/GroupQueryBuilder.java diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/index/group/GroupIndex.java b/gerrit-server/src/main/java/com/google/gerrit/server/index/group/GroupIndex.java index 5a92e17fa8..773da6754b 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/index/group/GroupIndex.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/index/group/GroupIndex.java @@ -17,9 +17,16 @@ package com.google.gerrit.server.index.group; import com.google.gerrit.reviewdb.client.AccountGroup; import com.google.gerrit.server.index.Index; import com.google.gerrit.server.index.IndexDefinition; +import com.google.gerrit.server.query.Predicate; +import com.google.gerrit.server.query.group.GroupPredicates; public interface GroupIndex extends Index { public interface Factory extends IndexDefinition.IndexFactory { } + + @Override + default Predicate keyPredicate(AccountGroup.UUID uuid) { + return GroupPredicates.uuid(uuid); + } } diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/query/group/GroupPredicates.java b/gerrit-server/src/main/java/com/google/gerrit/server/query/group/GroupPredicates.java new file mode 100644 index 0000000000..7f66f2d938 --- /dev/null +++ b/gerrit-server/src/main/java/com/google/gerrit/server/query/group/GroupPredicates.java @@ -0,0 +1,41 @@ +// Copyright (C) 2017 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.google.gerrit.server.query.group; + +import com.google.gerrit.reviewdb.client.AccountGroup; +import com.google.gerrit.server.index.FieldDef; +import com.google.gerrit.server.index.IndexPredicate; +import com.google.gerrit.server.index.group.GroupField; +import com.google.gerrit.server.query.Predicate; + +public class GroupPredicates { + public static Predicate uuid(AccountGroup.UUID uuid) { + return new GroupPredicate(GroupField.UUID, + GroupQueryBuilder.FIELD_UUID, uuid.get()); + } + + static class GroupPredicate extends IndexPredicate { + GroupPredicate(FieldDef def, String value) { + super(def, value); + } + + GroupPredicate(FieldDef def, String name, String value) { + super(def, name, value); + } + } + + private GroupPredicates() { + } +} diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/query/group/GroupQueryBuilder.java b/gerrit-server/src/main/java/com/google/gerrit/server/query/group/GroupQueryBuilder.java new file mode 100644 index 0000000000..4095a9e681 --- /dev/null +++ b/gerrit-server/src/main/java/com/google/gerrit/server/query/group/GroupQueryBuilder.java @@ -0,0 +1,40 @@ +// Copyright (C) 2017 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.google.gerrit.server.query.group; + +import com.google.gerrit.reviewdb.client.AccountGroup; +import com.google.gerrit.server.query.Predicate; +import com.google.gerrit.server.query.QueryBuilder; +import com.google.inject.Inject; + +/** + * Parses a query string meant to be applied to group objects. + */ +public class GroupQueryBuilder extends QueryBuilder { + public static final String FIELD_UUID = "uuid"; + + private static final QueryBuilder.Definition mydef = + new QueryBuilder.Definition<>(GroupQueryBuilder.class); + + @Inject + GroupQueryBuilder() { + super(mydef); + } + + @Operator + public Predicate uuid(String uuid) { + return GroupPredicates.uuid(new AccountGroup.UUID(uuid)); + } +}