opendev/gerrit
Code Issues Proposed changes

Rename AdminService to GroupAdminService

Browse Source 
The class is already fairly long for a Java class.  Adding in
admin support for projects and people is only going to make it
worse, so we are better off making one service interface per
major category of objects to be managed.

Signed-off-by: Shawn O. Pearce <sop@google.com>
This commit is contained in:
Shawn O. Pearce
2008-12-30 08:05:07 -08:00
parent 2b2b728b93
commit fdd9a5983b
7 changed files with 28 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
appjar/src/main/java/com/google/gerrit/Gerrit.gwt.xml
View File

@@ -22,12 +22,12 @@
class='com.google.gerrit.server.AccountServiceSrv'/>
<servlet path='/rpc/AccountSecurity'
class='com.google.gerrit.server.AccountSecuritySrv'/>
<servlet path='/rpc/AdminService'
class='com.google.gerrit.server.AdminServiceSrv'/>
<servlet path='/rpc/ChangeDetailService'
class='com.google.gerrit.server.ChangeDetailServiceSrv'/>
<servlet path='/rpc/ChangeListService'
class='com.google.gerrit.server.ChangeListServiceSrv'/>
<servlet path='/rpc/GroupAdminService'
class='com.google.gerrit.server.GroupAdminServiceSrv'/>
<servlet path='/rpc/PatchDetailService'
class='com.google.gerrit.server.PatchDetailServiceSrv'/>
<servlet path='/rpc/SuggestService'

10
appjar/src/main/java/com/google/gerrit/client/admin/AccountGroupScreen.java
View File

@@ -69,7 +69,7 @@ public class AccountGroupScreen extends Screen {
saveDesc.setEnabled(false);
super.onLoad();
Util.ADMIN_SVC.groupDetail(groupId,
Util.GROUP_SVC.groupDetail(groupId,
new GerritCallback<AccountGroupDetail>() {
public void onSuccess(final AccountGroupDetail result) {
enableForm(true);
@@ -103,7 +103,7 @@ public class AccountGroupScreen extends Screen {
saveDesc.addClickListener(new ClickListener() {
public void onClick(Widget sender) {
final String txt = descTxt.getText().trim();
Util.ADMIN_SVC.changeGroupDescription(groupId, txt,
Util.GROUP_SVC.changeGroupDescription(groupId, txt,
new GerritCallback<VoidResult>() {
public void onSuccess(final VoidResult result) {
saveDesc.setEnabled(false);
@@ -189,7 +189,7 @@ public class AccountGroupScreen extends Screen {
}
addMember.setEnabled(false);
Util.ADMIN_SVC.addGroupMember(groupId, nameEmail,
Util.GROUP_SVC.addGroupMember(groupId, nameEmail,
new GerritCallback<AccountGroupDetail>() {
public void onSuccess(final AccountGroupDetail result) {
addMember.setEnabled(true);
@@ -271,7 +271,7 @@ public class AccountGroupScreen extends Screen {
}
}
if (!ids.isEmpty()) {
Util.ADMIN_SVC.deleteGroupMembers(ids,
Util.GROUP_SVC.deleteGroupMembers(ids,
new GerritCallback<VoidResult>() {
public void onSuccess(final VoidResult result) {
for (int row = 1; row < table.getRowCount();) {
@@ -316,7 +316,7 @@ public class AccountGroupScreen extends Screen {
public void onClick(Widget sender) {
final boolean oldValue = k.isGroupOwner();
final boolean newValue = owner.isChecked();
Util.ADMIN_SVC.changeGroupOwner(k.getKey(), newValue,
Util.GROUP_SVC.changeGroupOwner(k.getKey(), newValue,
new GerritCallback<VoidResult>() {
public void onSuccess(final VoidResult result) {
k.setGroupOwner(newValue);

2
appjar/src/main/java/com/google/gerrit/client/admin/AdminService.java → appjar/src/main/java/com/google/gerrit/client/admin/GroupAdminService.java
View File

@@ -23,7 +23,7 @@ import com.google.gwtjsonrpc.client.VoidResult;
import java.util.Set;
public interface AdminService extends RemoteJsonService {
public interface GroupAdminService extends RemoteJsonService {
@SignInRequired
void groupDetail(AccountGroup.Id groupId,
AsyncCallback<AccountGroupDetail> callback);

6
appjar/src/main/java/com/google/gerrit/client/admin/AdminServiceImpl.java → appjar/src/main/java/com/google/gerrit/client/admin/GroupAdminServiceImpl.java
View File

@@ -31,9 +31,9 @@ import java.util.Collections;
import java.util.HashSet;
import java.util.Set;
public class AdminServiceImpl extends BaseServiceImplementation implements
AdminService {
public AdminServiceImpl(final SchemaFactory<ReviewDb> rdf) {
public class GroupAdminServiceImpl extends BaseServiceImplementation implements
GroupAdminService {
public GroupAdminServiceImpl(final SchemaFactory<ReviewDb> rdf) {
super(rdf);
}

6
appjar/src/main/java/com/google/gerrit/client/admin/Util.java
View File

@@ -20,10 +20,10 @@ import com.google.gwtjsonrpc.client.JsonUtil;
public class Util {
public static final AdminConstants C = GWT.create(AdminConstants.class);
public static final AdminMessages M = GWT.create(AdminMessages.class);
public static final AdminService ADMIN_SVC;
public static final GroupAdminService GROUP_SVC;
static {
ADMIN_SVC = GWT.create(AdminService.class);
JsonUtil.bind(ADMIN_SVC, "rpc/AdminService");
GROUP_SVC = GWT.create(GroupAdminService.class);
JsonUtil.bind(GROUP_SVC, "rpc/GroupAdminService");
}
}

8
appjar/src/main/java/com/google/gerrit/server/AdminServiceSrv.java → appjar/src/main/java/com/google/gerrit/server/GroupAdminServiceSrv.java
View File

@@ -14,12 +14,12 @@
package com.google.gerrit.server;
import com.google.gerrit.client.admin.AdminServiceImpl;
import com.google.gerrit.client.admin.GroupAdminServiceImpl;
/** Publishes {@link AdminServiceImpl} over JSON. */
public class AdminServiceSrv extends GerritJsonServlet {
/** Publishes {@link GroupAdminServiceImpl} over JSON. */
public class GroupAdminServiceSrv extends GerritJsonServlet {
@Override
protected Object createServiceHandle() throws Exception {
return new AdminServiceImpl(GerritServer.getInstance().getDatabase());
return new GroupAdminServiceImpl(GerritServer.getInstance().getDatabase());
}
}