opendev/gerrit
Code Issues Proposed changes

Suppress deprecation warnings from ServletScopes

Browse Source 
Yes, these are deprecated, but they have been working fine for us for
a long time, and it's not obvious that the suggested replacement will
work.

Change-Id: I1ef773b160ba3aef8fa6fcf509c03d88c6217f1a
This commit is contained in:
Dave Borowitz
2016-10-17 11:02:03 -04:00
parent 5fb98d05ab
commit 0b27eed770
2 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
gerrit-server/src/main/java/com/google/gerrit/server/util/GuiceRequestScopePropagator.java
View File

@@ -52,6 +52,10 @@ public class GuiceRequestScopePropagator extends RequestScopePropagator {
/** /**
* @see RequestScopePropagator#wrap(Callable) * @see RequestScopePropagator#wrap(Callable)
*/ */
// ServletScopes#continueRequest is deprecated, but it's not obvious their
// recommended replacement is an appropriate drop-in solution; see
// https://gerrit-review.googlesource.com/83971
@SuppressWarnings("deprecation")
@Override @Override
protected <T> Callable<T> wrapImpl(Callable<T> callable) { protected <T> Callable<T> wrapImpl(Callable<T> callable) {
Map<Key<?>, Object> seedMap = new HashMap<>(); Map<Key<?>, Object> seedMap = new HashMap<>();

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

@@ -85,6 +85,7 @@ public abstract class RequestScopePropagator {
* @param callable the Callable to wrap. * @param callable the Callable to wrap.
* @return a new Callable which will execute in the current request scope. * @return a new Callable which will execute in the current request scope.
*/ */
@SuppressWarnings("javadoc") // See GuiceRequestScopePropagator#wrapImpl
public final <T> Callable<T> wrap(final Callable<T> callable) { public final <T> Callable<T> wrap(final Callable<T> callable) {
final RequestContext callerContext = checkNotNull(local.getContext()); final RequestContext callerContext = checkNotNull(local.getContext());
final Callable<T> wrapped = final Callable<T> wrapped =