opendev/gerrit
Code Issues Proposed changes

Merge changes from topic 'replace-rpc-services'

Browse Source 
* changes:
  Remove unused RPC suggest service
  PermissionEditor: Use REST API instead of RPC service
  AccountGroupSuggestOracle: Use REST API rather than RPC service
  ListGroups: Allow -s as an alias of --suggest
This commit is contained in:
Edwin Kempin
2016-02-18 08:51:38 +00:00
committed by Gerrit Code Review
parent f9a26fd5e1 d8889fe94c
commit 64c289e88f
9 changed files with 50 additions and 176 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Documentation/rest-api-groups.txt
View File

@@ -174,13 +174,12 @@ Query 25 groups starting from index 50.
[[suggest-group]]
==== Suggest Group
The `suggest` option indicates a user-entered string that
The `suggest` or `s` option indicates a user-entered string that
should be auto-completed to group names.
If this option is set and `n` is not set, then `n` defaults to 10.
When using this option,
the `project` or `p` option can be used to name the current project,
to allow context-dependent suggestions.
When using this option, the `project` or `p` option can be used to
name the current project, to allow context-dependent suggestions.
Not compatible with `visible-to-all`, `owned`, `user`, `match`, `q`,
or `S`.

29
gerrit-common/src/main/java/com/google/gerrit/common/data/SuggestService.java
View File

@@ -1,29 +0,0 @@
// Copyright (C) 2008 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.common.data;
import com.google.gerrit.reviewdb.client.Project;
import com.google.gwtjsonrpc.common.AsyncCallback;
import com.google.gwtjsonrpc.common.RemoteJsonService;
import com.google.gwtjsonrpc.common.RpcImpl;
import com.google.gwtjsonrpc.common.RpcImpl.Version;
import java.util.List;
@RpcImpl(version = Version.V2_0)
public interface SuggestService extends RemoteJsonService {
void suggestAccountGroupForProject(Project.NameKey project, String query,
int limit, AsyncCallback<List<GroupReference>> callback);
}

16
gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/PermissionEditor.java
View File

@@ -14,8 +14,8 @@
package com.google.gerrit.client.admin;
import com.google.gerrit.client.groups.GroupMap;
import com.google.gerrit.client.rpc.GerritCallback;
import com.google.gerrit.client.ui.SuggestUtil;
import com.google.gerrit.common.data.AccessSection;
import com.google.gerrit.common.data.GlobalCapability;
import com.google.gerrit.common.data.GroupInfo;
@@ -241,14 +241,16 @@ public class PermissionEditor extends Composite implements Editor<Permission>,
// If the oracle didn't get to complete a UUID, resolve it now.
//
addRule.setEnabled(false);
SuggestUtil.SVC.suggestAccountGroupForProject(
projectName, ref.getName(), 1,
new GerritCallback<List<GroupReference>>() {
GroupMap.suggestAccountGroupForProject(
projectName.get(), ref.getName(), 1,
new GerritCallback<GroupMap>() {
@Override
public void onSuccess(List<GroupReference> result) {
public void onSuccess(GroupMap result) {
addRule.setEnabled(true);
if (result.size() == 1) {
addGroup(result.get(0));
if (result.values().length() == 1) {
addGroup(new GroupReference(
result.values().get(0).getGroupUUID(),
result.values().get(0).name()));
} else {
groupToAdd.setFocus(true);
}

15
gerrit-gwtui/src/main/java/com/google/gerrit/client/groups/GroupMap.java
View File

@@ -38,6 +38,21 @@ public class GroupMap extends NativeMap<GroupInfo> {
call.get(NativeMap.copyKeysIntoChildren(cb));
}
public static void suggestAccountGroupForProject(String project, String query,
int limit, AsyncCallback<GroupMap> cb) {
RestApi call = groups();
if (project != null) {
call.addParameter("p", project);
}
if (query != null) {
call.addParameter("s", query);
}
if (limit > 0) {
call.addParameter("n", limit);
}
call.get(NativeMap.copyKeysIntoChildren(cb));
}
public static void myOwned(AsyncCallback<GroupMap> cb) {
myOwnedGroups().get(NativeMap.copyKeysIntoChildren(cb));
}

48
gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/AccountGroupSuggestOracle.java
View File

@@ -14,16 +14,16 @@
package com.google.gerrit.client.ui;
import com.google.gerrit.client.RpcStatus;
import com.google.gerrit.client.groups.GroupInfo;
import com.google.gerrit.client.groups.GroupMap;
import com.google.gerrit.client.rpc.GerritCallback;
import com.google.gerrit.common.data.GroupReference;
import com.google.gerrit.client.rpc.Natives;
import com.google.gerrit.reviewdb.client.AccountGroup;
import com.google.gerrit.reviewdb.client.Project;
import com.google.gwt.user.client.ui.SuggestOracle;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
/** Suggestion Oracle for AccountGroup entities. */
@@ -34,26 +34,20 @@ public class AccountGroupSuggestOracle extends SuggestAfterTypingNCharsOracle {
@Override
public void _onRequestSuggestions(final Request req, final Callback callback) {
RpcStatus.hide(new Runnable() {
@Override
public void run() {
SuggestUtil.SVC.suggestAccountGroupForProject(
projectName, req.getQuery(), req.getLimit(),
new GerritCallback<List<GroupReference>>() {
@Override
public void onSuccess(final List<GroupReference> result) {
priorResults.clear();
final ArrayList<AccountGroupSuggestion> r =
new ArrayList<>(result.size());
for (final GroupReference p : result) {
r.add(new AccountGroupSuggestion(p));
priorResults.put(p.getName(), p.getUUID());
}
callback.onSuggestionsReady(req, new Response(r));
}
});
}
});
GroupMap.suggestAccountGroupForProject(
projectName.get(), req.getQuery(), req.getLimit(),
new GerritCallback<GroupMap>() {
@Override
public void onSuccess(GroupMap result) {
priorResults.clear();
ArrayList<AccountGroupSuggestion> r = new ArrayList<>(result.size());
for (GroupInfo group : Natives.asList(result.values())) {
r.add(new AccountGroupSuggestion(group));
priorResults.put(group.name(), group.getGroupUUID());
}
callback.onSuggestionsReady(req, new Response(r));
}
});
}
public void setProject(Project.NameKey projectName) {
@@ -62,20 +56,20 @@ public class AccountGroupSuggestOracle extends SuggestAfterTypingNCharsOracle {
private static class AccountGroupSuggestion implements
SuggestOracle.Suggestion {
private final GroupReference info;
private final GroupInfo info;
AccountGroupSuggestion(final GroupReference k) {
AccountGroupSuggestion(final GroupInfo k) {
info = k;
}
@Override
public String getDisplayString() {
return info.getName();
return info.name();
}
@Override
public String getReplacementString() {
return info.getName();
return info.name();
}
}

31
gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/SuggestUtil.java
View File

@@ -1,31 +0,0 @@
// Copyright (C) 2008 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.client.ui;
import com.google.gerrit.common.data.SuggestService;
import com.google.gwt.core.client.GWT;
import com.google.gwtjsonrpc.client.JsonUtil;
public class SuggestUtil {
public static final SuggestService SVC;
static {
SVC = GWT.create(SuggestService.class);
JsonUtil.bind(SVC, "rpc/SuggestService");
}
private SuggestUtil() {
}
}

76
gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/SuggestServiceImpl.java
View File

@@ -1,76 +0,0 @@
// Copyright (C) 2008 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.httpd.rpc;
import com.google.common.collect.Iterables;
import com.google.common.collect.Lists;
import com.google.gerrit.common.Nullable;
import com.google.gerrit.common.data.GroupReference;
import com.google.gerrit.common.data.SuggestService;
import com.google.gerrit.reviewdb.client.Project;
import com.google.gerrit.reviewdb.server.ReviewDb;
import com.google.gerrit.server.CurrentUser;
import com.google.gerrit.server.account.GroupBackend;
import com.google.gerrit.server.project.NoSuchProjectException;
import com.google.gerrit.server.project.ProjectControl;
import com.google.gwtjsonrpc.common.AsyncCallback;
import com.google.inject.Inject;
import com.google.inject.Provider;
import java.util.Collections;
import java.util.List;
class SuggestServiceImpl extends BaseServiceImplementation implements
SuggestService {
private final ProjectControl.Factory projectControlFactory;
private final GroupBackend groupBackend;
@Inject
SuggestServiceImpl(final Provider<ReviewDb> schema,
final Provider<CurrentUser> currentUser,
final ProjectControl.Factory projectControlFactory,
final GroupBackend groupBackend) {
super(schema, currentUser);
this.projectControlFactory = projectControlFactory;
this.groupBackend = groupBackend;
}
@Override
public void suggestAccountGroupForProject(final Project.NameKey project,
final String query, final int limit,
final AsyncCallback<List<GroupReference>> callback) {
run(callback, new Action<List<GroupReference>>() {
@Override
public List<GroupReference> run(final ReviewDb db) {
ProjectControl projectControl = null;
if (project != null) {
try {
projectControl = projectControlFactory.controlFor(project);
} catch (NoSuchProjectException e) {
return Collections.emptyList();
}
}
return suggestAccountGroup(projectControl, query, limit);
}
});
}
private List<GroupReference> suggestAccountGroup(
@Nullable final ProjectControl projectControl, final String query, final int limit) {
return Lists.newArrayList(Iterables.limit(
groupBackend.suggest(query, projectControl),
limit <= 0 ? 10 : Math.min(limit, 10)));
}
}

1
gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/UiRpcModule.java
View File

@@ -27,7 +27,6 @@ public class UiRpcModule extends RpcServletModule {
@Override
protected void configureServlets() {
rpc(SuggestServiceImpl.class);
rpc(SystemInfoServiceImpl.class);
install(new AccountModule());

3
gerrit-server/src/main/java/com/google/gerrit/server/group/ListGroups.java
View File

@@ -127,7 +127,8 @@ public class ListGroups implements RestReadView<TopLevelResource> {
this.matchSubstring = matchSubstring;
}
@Option(name = "--suggest", usage = "to get a suggestion of groups")
@Option(name = "--suggest", aliases = {"-s"},
usage = "to get a suggestion of groups")
public void setSuggest(String suggest) {
this.suggest = suggest;
}