opendev/gerrit
Code Issues Proposed changes

Merge changes from topic "RestApiException-refactoring"

Browse Source 
* changes:
  Make RestApiException(String, Exception) constructor protected
  Do not throw generic RestApiException to signal an internal server error
  ProjectsImpl: Use asRestApiException method to wrap exception as RestApiException
  Make RestApiException(String) constructor protected
  Submit: Do not throw generic RestApiException to signal an internal server error
  RestApiException: Make default constructor protected
  Remove unused default constructors from RestApiException classes
  PluginCollection: Pass id which was not found to ResourceNotFoundException
  RestApiServlet: Return error message when raw input is not supported
  Make error response for non-default dashboards consistent & include message
This commit is contained in:
David Pursehouse
2019-12-29 11:18:09 +00:00
committed by Gerrit Code Review
parent 4c83952256 7c97209f6d
commit 494d93fd26
15 changed files with 28 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
java/com/google/gerrit/server/restapi/change/Submit.java
View File

@@ -212,12 +212,10 @@ public class Submit
return Response.ok(new Output(change));
}
String msg =
throw new IllegalStateException(
String.format(
"change %s of project %s unexpectedly had status %s after submit attempt",
updatedChange.getId(), updatedChange.getProject(), updatedChange.getStatus());
logger.atWarning().log(msg);
throw new RestApiException(msg);
updatedChange.getId(), updatedChange.getProject(), updatedChange.getStatus()));
}
}

4
java/com/google/gerrit/server/restapi/project/CreateDashboard.java
View File

@@ -17,7 +17,7 @@ package com.google.gerrit.server.restapi.project;
import com.google.gerrit.extensions.api.projects.DashboardInfo;
import com.google.gerrit.extensions.api.projects.SetDashboardInput;
import com.google.gerrit.extensions.restapi.IdString;
import com.google.gerrit.extensions.restapi.ResourceNotFoundException;
import com.google.gerrit.extensions.restapi.MethodNotAllowedException;
import com.google.gerrit.extensions.restapi.Response;
import com.google.gerrit.extensions.restapi.RestApiException;
import com.google.gerrit.extensions.restapi.RestCollectionCreateView;
@@ -48,7 +48,7 @@ public class CreateDashboard
throws RestApiException, IOException, PermissionBackendException {
parent.getProjectState().checkStatePermitsWrite();
if (!DashboardsCollection.isDefaultDashboard(id)) {
throw new ResourceNotFoundException(id);
throw new MethodNotAllowedException("cannot create non-default dashboard");
}
SetDefaultDashboard set = setDefault.get();
set.inherited = inherited;

2
java/com/google/gerrit/server/restapi/project/DeleteDashboard.java
View File

@@ -43,6 +43,6 @@ public class DeleteDashboard implements RestModifyView<DashboardResource, SetDas
}
// TODO: Implement delete of dashboards by API.
throw new MethodNotAllowedException();
throw new MethodNotAllowedException("cannot delete non-default dashboard");
}
}

4
java/com/google/gerrit/server/restapi/project/SetDashboard.java
View File

@@ -40,7 +40,7 @@ public class SetDashboard implements RestModifyView<DashboardResource, SetDashbo
return defaultSetter.get().apply(resource, input);
}
// TODO: Implement creation/update of dashboards by API.
throw new MethodNotAllowedException();
// TODO: Implement update of dashboards by API.
throw new MethodNotAllowedException("cannot update non-default dashboard");
}
}