b53581be87
I9a4088d2 was intended to be a no-op refactoring, but unfortunately it broke the implementation of plugin-provided change query operators, which were previously untested. Add a test of the behavior as documented in dev-plugins.txt. The test failure was caused by a private method that mutates the opFactories map, which is intended to be immutable for the lifetime of a ChangeQueryBuilder. The old implementation wasn't broken per se, because the private method was called only from the constructor, but it was not trivial to reason about (hence why the subsequent breakage slipped through review). Instead of reinstating the mutable field, push the DynamicMap iteration into the QueryBuilder constructor. In order to prove that the DynamicMap iteration is typesafe, introduce a new type parameter to QueryBuilder, allowing us to remove the warning suppression on the constructor. Change-Id: I06cf253c82bf03bc97dcba08ca7d494011c88384
47 lines
1.6 KiB
Java
47 lines
1.6 KiB
Java
// Copyright (C) 2013 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.index.change;
|
|
|
|
import com.google.gerrit.index.query.OperatorPredicate;
|
|
import com.google.gerrit.index.query.Predicate;
|
|
import com.google.gerrit.server.query.change.ChangeData;
|
|
import com.google.gerrit.server.query.change.ChangeQueryBuilder;
|
|
import org.junit.Ignore;
|
|
|
|
@Ignore
|
|
public class FakeQueryBuilder extends ChangeQueryBuilder {
|
|
FakeQueryBuilder(ChangeIndexCollection indexes) {
|
|
super(
|
|
new ChangeQueryBuilder.Definition<>(FakeQueryBuilder.class),
|
|
new ChangeQueryBuilder.Arguments(
|
|
null, null, null, null, null, null, null, null, null, null, null, null, null, null,
|
|
null, null, null, null, indexes, null, null, null, null, null, null, null));
|
|
}
|
|
|
|
@Operator
|
|
public Predicate<ChangeData> foo(String value) {
|
|
return predicate("foo", value);
|
|
}
|
|
|
|
@Operator
|
|
public Predicate<ChangeData> bar(String value) {
|
|
return predicate("bar", value);
|
|
}
|
|
|
|
private Predicate<ChangeData> predicate(String name, String value) {
|
|
return new OperatorPredicate<ChangeData>(name, value) {};
|
|
}
|
|
}
|