Cronet API Refactoring

components/cronet/android/java/src/org/chromium/net/impl/CronetUrlRequest.java

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 package org.chromium.net.impl;
 
-import android.util.Log;
-
+import org.chromium.base.Log;
 import org.chromium.base.VisibleForTesting;
 import org.chromium.base.annotations.CalledByNative;
 import org.chromium.base.annotations.JNIAdditionalImport;
 import org.chromium.base.annotations.JNINamespace;
 import org.chromium.base.annotations.NativeClassQualifiedName;
 import org.chromium.net.InlineExecutionProhibitedException;
-import org.chromium.net.Preconditions;
 import org.chromium.net.QuicException;
 import org.chromium.net.RequestFinishedInfo;
 import org.chromium.net.RequestPriority;
 import org.chromium.net.UploadDataProvider;
 import org.chromium.net.UrlRequest;
 import org.chromium.net.UrlRequestException;
 import org.chromium.net.UrlResponseInfo;
 
 import java.nio.ByteBuffer;
 import java.util.AbstractMap;
@@ skipping 12 matching lines @@
  * All @CallByNative methods are called on native network thread
  * and post tasks with listener calls onto Executor. Upon return from listener
  * callback native request adapter is called on executive thread and posts
  * native tasks to native network thread. Because Cancel could be called from
  * any thread it is protected by mUrlRequestAdapterLock.
  */
 @JNINamespace("cronet")
 // Qualifies UrlRequest.StatusListener which is used in onStatus, a JNI method.
 @JNIAdditionalImport(UrlRequest.class)
 @VisibleForTesting
-public final class CronetUrlRequest implements UrlRequest {
+public final class CronetUrlRequest extends UrlRequestBase {
     private final boolean mAllowDirectExecutor;
 
     /* Native adapter object, owned by UrlRequest. */
     @GuardedBy("mUrlRequestAdapterLock")
     private long mUrlRequestAdapter;
 
     @GuardedBy("mUrlRequestAdapterLock")
     private boolean mStarted = false;
     @GuardedBy("mUrlRequestAdapterLock")
     private boolean mWaitingOnRedirect = false;
@@ skipping 563 matching lines @@
                     Log.e(CronetUrlRequestContext.LOG_TAG, "Exception in onComplete method", e);
                 }
             }
         };
         postTaskToExecutor(task);
     }
 
     /**
      * Called when error has occured, no callbacks will be called afterwards.
      *
-     * @param errorCode error code from {@link UrlRequestException.ERROR_LISTENER_EXCEPTION_THROWN
-     *         UrlRequestException.ERROR_*}.
+     * @param errorCode Error code represented by {@code UrlRequestError} that should be mapped
+     *                  to one of {@link UrlRequestException#ERROR_LISTENER_EXCEPTION_THROWN
+     *                  UrlRequestException.ERROR_*}.
      * @param nativeError native net error code.
      * @param errorString textual representation of the error code.
      * @param receivedBytesCount number of bytes received.
      */
     @SuppressWarnings("unused")
     @CalledByNative
     private void onError(int errorCode, int nativeError, int nativeQuicError, String errorString,
             long receivedBytesCount) {
         mFinishedReason = RequestFinishedInfo.FAILED;
         if (mResponseInfo != null) {
             mResponseInfo.setReceivedBytesCount(
                     mReceivedBytesCountFromRedirects + receivedBytesCount);
         }
         if (errorCode == UrlRequestException.ERROR_QUIC_PROTOCOL_FAILED) {
             failWithException(new QuicException(
                     "Exception in CronetUrlRequest: " + errorString, nativeError, nativeQuicError));
         } else {
+            int javaError = mapUrlRequestErrorToApiErrorCode(errorCode);
             failWithException(new UrlRequestException(
-                    "Exception in CronetUrlRequest: " + errorString, errorCode, nativeError));
+                    "Exception in CronetUrlRequest: " + errorString, javaError, nativeError));
         }
     }
 
     /**
      * Called when request is canceled, no callbacks will be called afterwards.
      */
     @SuppressWarnings("unused")
     @CalledByNative
     private void onCanceled() {
         mFinishedReason = RequestFinishedInfo.CANCELED;
@@ skipping 13 matching lines @@
     /**
      * Called by the native code when request status is fetched from the
      * native stack.
      */
     @SuppressWarnings("unused")
     @CalledByNative
     private void onStatus(final UrlRequest.StatusListener listener, final int loadState) {
         Runnable task = new Runnable() {
             @Override
             public void run() {
-                listener.onStatus(UrlRequest.Status.convertLoadState(loadState));
+                listener.onStatus(convertLoadState(loadState));
             }
         };
         postTaskToExecutor(task);
     }
 
     /**
      * Called by the native code to report metrics.
      */
     @SuppressWarnings("unused")
     @CalledByNative
@@ skipping 19 matching lines @@
                 mResponseInfo, mException);
     }
 
     /** Enforces prohibition of direct execution. */
     void checkCallingThread() {
         if (!mAllowDirectExecutor && mRequestContext.isNetworkThread(Thread.currentThread())) {
             throw new InlineExecutionProhibitedException();
         }
     }
 
+    private int mapUrlRequestErrorToApiErrorCode(int errorCode) {
+        switch (errorCode) {
+            case UrlRequestError.LISTENER_EXCEPTION_THROWN:
+                return UrlRequestException.ERROR_LISTENER_EXCEPTION_THROWN;
+            case UrlRequestError.HOSTNAME_NOT_RESOLVED:
+                return UrlRequestException.ERROR_HOSTNAME_NOT_RESOLVED;
+            case UrlRequestError.INTERNET_DISCONNECTED:
+                return UrlRequestException.ERROR_INTERNET_DISCONNECTED;
+            case UrlRequestError.NETWORK_CHANGED:
+                return UrlRequestException.ERROR_NETWORK_CHANGED;
+            case UrlRequestError.TIMED_OUT:
+                return UrlRequestException.ERROR_TIMED_OUT;
+            case UrlRequestError.CONNECTION_CLOSED:
+                return UrlRequestException.ERROR_CONNECTION_CLOSED;
+            case UrlRequestError.CONNECTION_TIMED_OUT:
+                return UrlRequestException.ERROR_CONNECTION_TIMED_OUT;
+            case UrlRequestError.CONNECTION_REFUSED:
+                return UrlRequestException.ERROR_CONNECTION_REFUSED;
+            case UrlRequestError.CONNECTION_RESET:
+                return UrlRequestException.ERROR_CONNECTION_RESET;
+            case UrlRequestError.ADDRESS_UNREACHABLE:
+                return UrlRequestException.ERROR_ADDRESS_UNREACHABLE;
+            case UrlRequestError.QUIC_PROTOCOL_FAILED:
+                return UrlRequestException.ERROR_QUIC_PROTOCOL_FAILED;
+            case UrlRequestError.OTHER:
+                return UrlRequestException.ERROR_OTHER;
+            default:
+                Log.e(CronetUrlRequestContext.LOG_TAG, "Unknown error code: " + errorCode);
+                return errorCode;
+        }
+    }
+
     // Native methods are implemented in cronet_url_request_adapter.cc.
 
     private native long nativeCreateRequestAdapter(long urlRequestContextAdapter, String url,
             int priority, boolean disableCache, boolean disableConnectionMigration,
             boolean enableMetrics);
 
     @NativeClassQualifiedName("CronetURLRequestAdapter")
     private native boolean nativeSetHttpMethod(long nativePtr, String method);
 
     @NativeClassQualifiedName("CronetURLRequestAdapter")
     private native boolean nativeAddRequestHeader(long nativePtr, String name, String value);
 
     @NativeClassQualifiedName("CronetURLRequestAdapter")
     private native void nativeStart(long nativePtr);
 
     @NativeClassQualifiedName("CronetURLRequestAdapter")
     private native void nativeFollowDeferredRedirect(long nativePtr);
 
     @NativeClassQualifiedName("CronetURLRequestAdapter")
     private native boolean nativeReadData(
             long nativePtr, ByteBuffer byteBuffer, int position, int capacity);
 
     @NativeClassQualifiedName("CronetURLRequestAdapter")
     private native void nativeDestroy(long nativePtr, boolean sendOnCanceled);
 
     @NativeClassQualifiedName("CronetURLRequestAdapter")
     private native void nativeGetStatus(long nativePtr, UrlRequest.StatusListener listener);
 }