opendev/gerrit
Code Issues Proposed changes

Upgrade Guava to 20.0-rc1

Browse Source 
The propagate and propagateIfPossible methods are deprecated. Replace
them with the recommended alternatives.

Change-Id: I9107dc51b968e2acc453502ece3c5ed5dd58b5de
This commit is contained in:
David Pursehouse
2016-10-24 21:41:57 +09:00
parent 5c7dbae701
commit ef6398e9d0
20 changed files with 31 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
WORKSPACE
View File

@@ -223,8 +223,8 @@ maven_jar(
maven_jar(
name = 'guava',
artifact = 'com.google.guava:guava:19.0',
sha1 = '6ce200f6b23222af3d8abb6b6459e6c44f4bb0e9',
artifact = 'com.google.guava:guava:20.0-rc1',
sha1 = '4c2a4581b69b16a57968da32fcadb8e362b639b2',
)
maven_jar(

2
gerrit-lucene/src/main/java/com/google/gerrit/lucene/LuceneChangeIndex.java
View File

@@ -399,7 +399,7 @@ public class LuceneChangeIndex implements ChangeIndex {
close();
throw new OrmRuntimeException(e);
} catch (ExecutionException e) {
Throwables.propagateIfPossible(e.getCause());
Throwables.throwIfUnchecked(e.getCause());
throw new OrmRuntimeException(e.getCause());
}
}

2
gerrit-server/src/main/java/com/google/gerrit/server/account/AccountLoader.java
View File

@@ -94,7 +94,7 @@ public class AccountLoader {
directory.fillAccountInfo(
Iterables.concat(created.values(), provided), options);
} catch (DirectoryException e) {
Throwables.propagateIfPossible(e.getCause(), OrmException.class);
Throwables.throwIfInstanceOf(e.getCause(), OrmException.class);
throw new OrmException(e);
}
}

2
gerrit-server/src/main/java/com/google/gerrit/server/account/GetDetail.java
View File

@@ -47,7 +47,7 @@ public class GetDetail implements RestReadView<AccountResource> {
directory.fillAccountInfo(Collections.singleton(info),
EnumSet.allOf(FillOptions.class));
} catch (DirectoryException e) {
Throwables.propagateIfPossible(e.getCause(), OrmException.class);
Throwables.throwIfInstanceOf(e.getCause(), OrmException.class);
throw new OrmException(e);
}
return info;

4
gerrit-server/src/main/java/com/google/gerrit/server/auth/ldap/Helper.java
View File

@@ -154,8 +154,8 @@ import javax.security.auth.login.LoginException;
}
});
} catch (PrivilegedActionException e) {
Throwables.propagateIfPossible(e.getException(), NamingException.class);
Throwables.propagateIfPossible(e.getException(), RuntimeException.class);
Throwables.throwIfInstanceOf(e.getException(), NamingException.class);
Throwables.throwIfInstanceOf(e.getException(), RuntimeException.class);
LdapRealm.log.warn("Internal error", e.getException());
return null;
} finally {

2
gerrit-server/src/main/java/com/google/gerrit/server/change/ChangeJson.java
View File

@@ -299,7 +299,7 @@ public class ChangeJson {
} catch (PatchListNotAvailableException | GpgException | OrmException
| IOException | RuntimeException e) {
if (!has(CHECK)) {
Throwables.propagateIfPossible(e, OrmException.class);
Throwables.throwIfInstanceOf(e, OrmException.class);
throw new OrmException(e);
}
return checkOnly(cd);

8
gerrit-server/src/main/java/com/google/gerrit/server/git/BatchUpdate.java
View File

@@ -490,7 +490,7 @@ public class BatchUpdate implements AutoCloseable {
throw new ResourceNotFoundException(e.getMessage(), e);
} catch (Exception e) {
Throwables.propagateIfPossible(e);
Throwables.throwIfUnchecked(e);
throw new UpdateException(e);
}
}
@@ -693,7 +693,7 @@ public class BatchUpdate implements AutoCloseable {
logDebug("No objects to flush");
}
} catch (Exception e) {
Throwables.propagateIfPossible(e, RestApiException.class);
Throwables.throwIfInstanceOf(e, RestApiException.class);
throw new UpdateException(e);
}
}
@@ -778,8 +778,8 @@ public class BatchUpdate implements AutoCloseable {
}
success = true;
} catch (ExecutionException | InterruptedException e) {
Throwables.propagateIfInstanceOf(e.getCause(), UpdateException.class);
Throwables.propagateIfInstanceOf(e.getCause(), RestApiException.class);
Throwables.throwIfInstanceOf(e.getCause(), UpdateException.class);
Throwables.throwIfInstanceOf(e.getCause(), RestApiException.class);
throw new UpdateException(e);
} catch (OrmException | IOException e) {
throw new UpdateException(e);

4
gerrit-server/src/main/java/com/google/gerrit/server/notedb/RepoSequence.java
View File

@@ -197,7 +197,9 @@ public class RepoSequence {
limit = counter + count;
acquireCount++;
} catch (ExecutionException | RetryException e) {
Throwables.propagateIfInstanceOf(e.getCause(), OrmException.class);
if (e.getCause() != null) {
Throwables.throwIfInstanceOf(e.getCause(), OrmException.class);
}
throw new OrmException(e);
} catch (IOException e) {
throw new OrmException(e);

2
gerrit-server/src/main/java/com/google/gerrit/server/patch/IntraLineLoader.java
View File

@@ -93,7 +93,7 @@ class IntraLineLoader implements Callable<IntraLineDiff> {
} catch (ExecutionException e) {
// If there was an error computing the result, carry it
// up to the caller so the cache knows this key is invalid.
Throwables.propagateIfInstanceOf(e.getCause(), Exception.class);
Throwables.throwIfInstanceOf(e.getCause(), Exception.class);
throw new Exception(e.getMessage(), e.getCause());
}
}

2
gerrit-server/src/main/java/com/google/gerrit/server/patch/PatchListLoader.java
View File

@@ -279,7 +279,7 @@ public class PatchListLoader implements Callable<PatchList> {
} catch (ExecutionException e) {
// If there was an error computing the result, carry it
// up to the caller so the cache knows this key is invalid.
Throwables.propagateIfInstanceOf(e.getCause(), IOException.class);
Throwables.throwIfInstanceOf(e.getCause(), IOException.class);
throw new IOException(e.getMessage(), e.getCause());
}
}

2
gerrit-server/src/main/java/com/google/gerrit/server/project/ProjectCacheImpl.java
View File

@@ -150,7 +150,7 @@ public class ProjectCacheImpl implements ProjectCache {
} catch (ExecutionException e) {
if (!(e.getCause() instanceof RepositoryNotFoundException)) {
log.warn(String.format("Cannot read project %s", projectName.get()), e);
Throwables.propagateIfInstanceOf(e.getCause(), IOException.class);
Throwables.throwIfInstanceOf(e.getCause(), IOException.class);
throw new IOException(e);
}
return null;

2
gerrit-server/src/main/java/com/google/gerrit/server/project/RefPattern.java
View File

@@ -49,7 +49,7 @@ public class RefPattern {
try {
return exampleCache.get(refPattern);
} catch (ExecutionException e) {
Throwables.propagateIfPossible(e.getCause());
Throwables.throwIfUnchecked(e.getCause());
throw new RuntimeException(e);
}
} else if (refPattern.endsWith("/*")) {

4
gerrit-server/src/main/java/com/google/gerrit/server/query/AndSource.java
View File

@@ -83,7 +83,9 @@ public class AndSource<T> extends AndPredicate<T>
try {
return readImpl();
} catch (OrmRuntimeException err) {
Throwables.propagateIfInstanceOf(err.getCause(), OrmException.class);
if (err.getCause() != null) {
Throwables.throwIfInstanceOf(err.getCause(), OrmException.class);
}
throw new OrmException(err);
}
}

4
gerrit-server/src/main/java/com/google/gerrit/server/query/QueryProcessor.java
View File

@@ -136,7 +136,9 @@ public abstract class QueryProcessor<T> {
} catch (OrmRuntimeException e) {
throw new OrmException(e.getMessage(), e);
} catch (OrmException e) {
Throwables.propagateIfInstanceOf(e.getCause(), QueryParseException.class);
if (e.getCause() != null) {
Throwables.throwIfInstanceOf(e.getCause(), QueryParseException.class);
}
throw e;
}
}

2
gerrit-server/src/main/java/com/google/gerrit/server/util/RequestScopePropagator.java
View File

@@ -130,7 +130,7 @@ public abstract class RequestScopePropagator {
try {
wrapped.call();
} catch (Exception e) {
Throwables.propagateIfPossible(e);
Throwables.throwIfUnchecked(e);
throw new RuntimeException(e); // Not possible.
}
}

2
gerrit-sshd/src/main/java/com/google/gerrit/sshd/AliasCommand.java
View File

@@ -97,7 +97,7 @@ public class AliasCommand extends BaseCommand {
try {
cmd.destroy();
} catch (Exception e) {
Throwables.propagateIfPossible(e);
Throwables.throwIfUnchecked(e);
throw new RuntimeException(e);
}
}

2
gerrit-sshd/src/main/java/com/google/gerrit/sshd/DispatchCommand.java
View File

@@ -136,7 +136,7 @@ final class DispatchCommand extends BaseCommand {
try {
cmd.destroy();
} catch (Exception e) {
Throwables.propagateIfPossible(e);
Throwables.throwIfUnchecked(e);
throw new RuntimeException(e);
}
}

2
gerrit-sshd/src/main/java/com/google/gerrit/sshd/SuExec.java
View File

@@ -153,7 +153,7 @@ public final class SuExec extends BaseCommand {
try {
cmd.destroy();
} catch (Exception e) {
Throwables.propagateIfPossible(e);
Throwables.throwIfUnchecked(e);
throw new RuntimeException(e);
}
}

2
lib/BUCK
View File

@@ -70,7 +70,7 @@ maven_jar(
maven_jar(
name = 'guava',
id = 'com.google.guava:guava:' + GUAVA_VERSION,
sha1 = '6ce200f6b23222af3d8abb6b6459e6c44f4bb0e9',
sha1 = '4c2a4581b69b16a57968da32fcadb8e362b639b2',
license = 'Apache2.0',
)

2
lib/GUAVA_VERSION
View File

@@ -1,2 +1,2 @@
GUAVA_VERSION = '19.0'
GUAVA_VERSION = '20.0-rc1'
GUAVA_DOC_URL = 'https://google.github.io/guava/releases/' + GUAVA_VERSION + '/api/docs/'