opendev/gerrit
Code Issues Proposed changes

Remove unused CorruptEntityException

Browse Source 
CorruptEntityException is never thrown. Remove it and the few places where
its caught.

Change-Id: I19a3c219aea01092f4d128f1b938a019bea9f314
This commit is contained in:
David Pursehouse 2016-05-07 15:35:29 +09:00
parent 11d345d0be
commit 1574689dd3
4 changed files with 2 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
gerrit-common/src/main/java/com/google/gerrit/common/errors/CorruptEntityException.java
View File

@ -1,28 +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.errors;
import com.google.gwtorm.client.Key;
/** Error indicating the entity's database records are invalid. */
public class CorruptEntityException extends Exception {
private static final long serialVersionUID = 1L;
public static final String MESSAGE_PREFIX = "Corrupt Database Entity: ";
public CorruptEntityException(final Key<?> key) {
super(MESSAGE_PREFIX + key);
}
}

3
gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/BaseServiceImplementation.java
View File

@ -14,7 +14,6 @@
package com.google.gerrit.httpd.rpc;
import com.google.gerrit.common.errors.CorruptEntityException;
import com.google.gerrit.common.errors.InvalidQueryException;
import com.google.gerrit.common.errors.NoSuchEntityException;
import com.google.gerrit.common.errors.NoSuchGroupException;
@ -102,8 +101,6 @@ public class BaseServiceImplementation {
final AsyncCallback<T> callback, Exception e) {
if (e.getCause() instanceof Failure) {
callback.onFailure(e.getCause().getCause());
} else if (e.getCause() instanceof CorruptEntityException) {
callback.onFailure(e.getCause());
} else if (e.getCause() instanceof NoSuchEntityException) {
callback.onFailure(e.getCause());
} else {

4
gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/Handler.java
View File

@ -14,7 +14,6 @@
package com.google.gerrit.httpd.rpc;
import com.google.gerrit.common.errors.CorruptEntityException;
import com.google.gerrit.common.errors.NoSuchEntityException;
import com.google.gerrit.server.project.NoSuchChangeException;
import com.google.gerrit.server.project.NoSuchProjectException;
@ -74,9 +73,6 @@ public abstract class Handler<T> implements Callable<T> {
if (e.getCause() instanceof BaseServiceImplementation.Failure) {
callback.onFailure(e.getCause().getCause());
} else if (e.getCause() instanceof CorruptEntityException) {
callback.onFailure(e.getCause());
} else if (e.getCause() instanceof NoSuchEntityException) {
callback.onFailure(e.getCause());

7
gerrit-server/src/main/java/com/google/gerrit/server/patch/PatchFile.java
View File

@ -14,7 +14,6 @@
package com.google.gerrit.server.patch;
import com.google.gerrit.common.errors.CorruptEntityException;
import com.google.gerrit.common.errors.NoSuchEntityException;
import com.google.gerrit.reviewdb.client.Patch;
@ -87,12 +86,11 @@ public class PatchFile {
* @param file the file index to extract.
* @param line the line number to extract (1 based; 1 is the first line).
* @return the string version of the file line.
* @throws CorruptEntityException the patch cannot be read.
* @throws IOException the patch or complete file content cannot be read.
* @throws NoSuchEntityException
*/
public String getLine(final int file, final int line)
throws CorruptEntityException, IOException, NoSuchEntityException {
throws IOException, NoSuchEntityException {
switch (file) {
case 0:
if (a == null) {
@ -116,12 +114,11 @@ public class PatchFile {
*
* @param file the file index to extract.
* @return number of lines in file.
* @throws CorruptEntityException the patch cannot be read.
* @throws IOException the patch or complete file content cannot be read.
* @throws NoSuchEntityException the file is not exist.
*/
public int getLineCount(final int file)
throws CorruptEntityException, IOException, NoSuchEntityException {
throws IOException, NoSuchEntityException {
switch (file) {
case 0:
if (a == null) {