Merge "Remove StarredChangesUtil::byAccountId label parameter"
diff --git a/java/com/google/gerrit/server/query/change/ChangePredicates.java b/java/com/google/gerrit/server/query/change/ChangePredicates.java
index d32889f..5f909a1 100644
--- a/java/com/google/gerrit/server/query/change/ChangePredicates.java
+++ b/java/com/google/gerrit/server/query/change/ChangePredicates.java
@@ -23,12 +23,10 @@
import com.google.gerrit.entities.Project;
import com.google.gerrit.git.ObjectIds;
import com.google.gerrit.index.query.Predicate;
-import com.google.gerrit.index.query.QueryParseException;
import com.google.gerrit.server.CommentsUtil;
import com.google.gerrit.server.StarredChangesUtil;
import com.google.gerrit.server.change.HashtagsUtil;
import com.google.gerrit.server.index.change.ChangeField;
-import com.google.inject.ImplementedBy;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
@@ -71,25 +69,12 @@
return new ChangeIndexPredicate(ChangeField.COMMENTBY_SPEC, id.toString());
}
- @ImplementedBy(IndexEditByPredicateProvider.class)
- public interface EditByPredicateProvider {
-
- /**
- * Returns a predicate that matches changes where the provided {@link
- * com.google.gerrit.entities.Account.Id} has a pending change edit.
- */
- Predicate<ChangeData> editBy(Account.Id id) throws QueryParseException;
- }
-
/**
- * A default implementation of {@link EditByPredicateProvider}, based on th {@link
- * ChangeField#EDITBY_SPEC} index field.
+ * Returns a predicate that matches changes where the provided {@link
+ * com.google.gerrit.entities.Account.Id} has a pending change edit.
*/
- public static class IndexEditByPredicateProvider implements EditByPredicateProvider {
- @Override
- public Predicate<ChangeData> editBy(Account.Id id) {
- return new ChangeIndexPredicate(ChangeField.EDITBY_SPEC, id.toString());
- }
+ public static Predicate<ChangeData> editBy(Account.Id id) {
+ return new ChangeIndexPredicate(ChangeField.EDITBY_SPEC, id.toString());
}
/**
diff --git a/java/com/google/gerrit/server/query/change/ChangeQueryBuilder.java b/java/com/google/gerrit/server/query/change/ChangeQueryBuilder.java
index 7e2c767..b83b010 100644
--- a/java/com/google/gerrit/server/query/change/ChangeQueryBuilder.java
+++ b/java/com/google/gerrit/server/query/change/ChangeQueryBuilder.java
@@ -86,7 +86,6 @@
import com.google.gerrit.server.plugincontext.PluginSetContext;
import com.google.gerrit.server.project.ChildProjects;
import com.google.gerrit.server.project.ProjectCache;
-import com.google.gerrit.server.query.change.ChangePredicates.EditByPredicateProvider;
import com.google.gerrit.server.query.change.PredicateArgs.ValOp;
import com.google.gerrit.server.rules.SubmitRule;
import com.google.gerrit.server.submit.SubmitDryRun;
@@ -276,8 +275,6 @@
private final Provider<CurrentUser> self;
- private final EditByPredicateProvider editByPredicateProvider;
-
@Inject
@VisibleForTesting
public Arguments(
@@ -311,8 +308,7 @@
ExperimentFeatures experimentFeatures,
HasOperandAliasConfig hasOperandAliasConfig,
ChangeIsVisibleToPredicate.Factory changeIsVisbleToPredicateFactory,
- PluginSetContext<SubmitRule> submitRules,
- EditByPredicateProvider editByPredicateProvider) {
+ PluginSetContext<SubmitRule> submitRules) {
this(
queryProvider,
rewriter,
@@ -345,8 +341,7 @@
experimentFeatures,
hasOperandAliasConfig,
changeIsVisbleToPredicateFactory,
- submitRules,
- editByPredicateProvider);
+ submitRules);
}
private Arguments(
@@ -381,8 +376,7 @@
ExperimentFeatures experimentFeatures,
HasOperandAliasConfig hasOperandAliasConfig,
ChangeIsVisibleToPredicate.Factory changeIsVisbleToPredicateFactory,
- PluginSetContext<SubmitRule> submitRules,
- EditByPredicateProvider editByPredicateProvider) {
+ PluginSetContext<SubmitRule> submitRules) {
this.queryProvider = queryProvider;
this.rewriter = rewriter;
this.opFactories = opFactories;
@@ -415,7 +409,6 @@
this.experimentFeatures = experimentFeatures;
this.hasOperandAliasConfig = hasOperandAliasConfig;
this.submitRules = submitRules;
- this.editByPredicateProvider = editByPredicateProvider;
}
public Arguments asUser(CurrentUser otherUser) {
@@ -451,8 +444,7 @@
experimentFeatures,
hasOperandAliasConfig,
changeIsVisbleToPredicateFactory,
- submitRules,
- editByPredicateProvider);
+ submitRules);
}
Arguments asUser(Account.Id otherId) {
@@ -645,7 +637,7 @@
}
if ("edit".equalsIgnoreCase(value)) {
- return this.args.editByPredicateProvider.editBy(self());
+ return ChangePredicates.editBy(self());
}
if ("attention".equalsIgnoreCase(value)) {
@@ -1781,7 +1773,8 @@
return value;
}
- private Account.Id self() throws QueryParseException {
+ /** Returns {@link Account.Id} of the identified calling user. */
+ public Account.Id self() throws QueryParseException {
return args.getIdentifiedUser().getAccountId();
}
diff --git a/javatests/com/google/gerrit/server/index/change/FakeQueryBuilder.java b/javatests/com/google/gerrit/server/index/change/FakeQueryBuilder.java
index bfeb947..e879170 100644
--- a/javatests/com/google/gerrit/server/index/change/FakeQueryBuilder.java
+++ b/javatests/com/google/gerrit/server/index/change/FakeQueryBuilder.java
@@ -58,7 +58,6 @@
null,
null,
null,
- null,
null));
}
diff --git a/modules/jgit b/modules/jgit
index a190130..66b871b 160000
--- a/modules/jgit
+++ b/modules/jgit
@@ -1 +1 @@
-Subproject commit a1901305b26ed5e0116f138bc02837713d2cf5c3
+Subproject commit 66b871b777c1a58337e80dd03db68bb76b145a93
diff --git a/polygerrit-ui/app/elements/core/gr-router/gr-router.ts b/polygerrit-ui/app/elements/core/gr-router/gr-router.ts
index 3dbd1a0..c0433dd 100644
--- a/polygerrit-ui/app/elements/core/gr-router/gr-router.ts
+++ b/polygerrit-ui/app/elements/core/gr-router/gr-router.ts
@@ -189,7 +189,7 @@
// Matches /admin/repos/$REPO,tags with optional filter and offset.
TAG_LIST: /^\/admin\/repos\/(.+),tags\/?(?:\/q\/filter:(.*?))?(?:,(\d+))?$/,
- QUERY: /^\/q\/([^,]+)(,(\d+))?$/,
+ QUERY: /^\/q\/(.+?)(,(\d+))?$/,
/**
* Support vestigial params from GWT UI.
diff --git a/polygerrit-ui/app/elements/core/gr-router/gr-router_test.ts b/polygerrit-ui/app/elements/core/gr-router/gr-router_test.ts
index 3ca7bdc..87d100c 100644
--- a/polygerrit-ui/app/elements/core/gr-router/gr-router_test.ts
+++ b/polygerrit-ui/app/elements/core/gr-router/gr-router_test.ts
@@ -416,7 +416,7 @@
});
test('QUERY', async () => {
- // QUERY: /^\/q\/([^,]+)(,(\d+))?$/,
+ // QUERY: /^\/q\/(.+?)(,(\d+))?$/,
await checkUrlToState('/q/asdf', {
...createSearchViewState(),
query: 'asdf',
@@ -430,6 +430,15 @@
query: 'asdf',
offset: '123',
});
+ await checkUrlToState('/q/asdf,qwer', {
+ ...createSearchViewState(),
+ query: 'asdf,qwer',
+ });
+ await checkUrlToState('/q/asdf,qwer,123', {
+ ...createSearchViewState(),
+ query: 'asdf,qwer',
+ offset: '123',
+ });
});
test('QUERY_LEGACY_SUFFIX', async () => {
