remove redundant intercept of httpclient with httpmethod

Author: theScrabi

owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/OwnCloudClient.java

@@ -135,10 +135,10 @@ private int saveExecuteHttpMethod(HttpBaseMethod method) throws Exception {
                 method.setRequestHeader(AUTHORIZATION_HEADER, mCredentials.getHeaderAuth());
             }
 
-            status = method.execute();
+            status = method.execute(this);
 
             if (shouldConnectionValidatorBeCalled(method, status)) {
-                retry = mConnectionValidator.validate(this, mSingleSessionManager); // retry on success fail on no success
+                retry = mConnectionValidator.validate(this, mSingleSessionManager, getContext()); // retry on success fail on no success
             } else if(method.getFollowPermanentRedirects() && status == HTTP_MOVED_PERMANENTLY) {
                 retry = true;
                 method.setFollowRedirects(true);

owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/http/methods/HttpBaseMethod.kt

@@ -37,25 +37,40 @@ import java.net.MalformedURLException
 import java.net.URL
 import java.util.concurrent.TimeUnit
 
-abstract class HttpBaseMethod constructor(clientWrapper: HttpClient, url: URL) {
-    var okHttpClient: OkHttpClient
+abstract class HttpBaseMethod constructor(url: URL) {
     var httpUrl: HttpUrl = url.toHttpUrlOrNull() ?: throw MalformedURLException()
     var request: Request
     private var _followPermanentRedirects = false
     abstract var response: Response
-
     var call: Call? = null
 
+    var followRedirects: Boolean? = true
+    var retryOnConnectionFailure: Boolean? = false
+    var connectionTimeoutVal: Long? = null
+    var connectionTimeoutUnit: TimeUnit? = null
+    var readTimeoutVal: Long? = null
+    var readTimeoutUnit: TimeUnit? = null
+
     init {
-        okHttpClient = clientWrapper.okHttpClient
         request = Request.Builder()
             .url(httpUrl)
             .build()
     }
 
     @Throws(Exception::class)
-    open fun execute(): Int {
-        return onExecute()
+    open fun execute(httpClient: HttpClient): Int {
+        val okHttpClient = httpClient.okHttpClient.newBuilder().apply {
+            retryOnConnectionFailure?.let { retryOnConnectionFailure(it) }
+            followRedirects?.let { followRedirects(it) }
+            readTimeoutUnit?.let { unit ->
+                readTimeoutVal?.let { readTimeout(it, unit) }
+            }
+            connectionTimeoutUnit?.let { unit ->
+               connectionTimeoutVal?.let { connectTimeout(it, unit) }
+            }
+        }.build()
+
+        return onExecute(okHttpClient)
     }
 
     open fun setUrl(url: HttpUrl) {
@@ -137,42 +152,26 @@ abstract class HttpBaseMethod constructor(clientWrapper: HttpClient, url: URL) {
     //         Setter
     //////////////////////////////
     // Connection parameters
+    /*
     open fun setRetryOnConnectionFailure(retryOnConnectionFailure: Boolean) {
-        okHttpClient = okHttpClient.newBuilder()
-            .retryOnConnectionFailure(retryOnConnectionFailure)
-            .build()
+        retryOnConnectionFailureVal = true
     }
 
+     */
+
     open fun setReadTimeout(readTimeout: Long, timeUnit: TimeUnit) {
-        okHttpClient = okHttpClient.newBuilder()
-            .readTimeout(readTimeout, timeUnit)
-            .build()
+        readTimeoutVal = readTimeout
+        readTimeoutUnit = timeUnit
     }
 
     open fun setConnectionTimeout(
         connectionTimeout: Long,
         timeUnit: TimeUnit
     ) {
-        okHttpClient = okHttpClient.newBuilder()
-            .readTimeout(connectionTimeout, timeUnit)
-            .build()
+        connectionTimeoutVal = connectionTimeout
+        connectionTimeoutUnit = timeUnit
     }
 
-    open fun setFollowRedirects(followRedirects: Boolean) {
-        okHttpClient = okHttpClient.newBuilder()
-            .followRedirects(followRedirects)
-            .build()
-    }
-
-    open fun getFollowRedirects() = okHttpClient.followRedirects
-
-    open fun setFollowPermanentRedirects(followRedirects: Boolean) {
-        _followPermanentRedirects = followRedirects
-    }
-
-    open fun getFollowPermanentRedirects() = _followPermanentRedirects
-
-
     /************
      *** Call ***
      ************/
@@ -187,5 +186,5 @@ abstract class HttpBaseMethod constructor(clientWrapper: HttpClient, url: URL) {
     //         For override
     //////////////////////////////
     @Throws(Exception::class)
-    protected abstract fun onExecute(): Int
+    protected abstract fun onExecute(okHttpClient: OkHttpClient): Int
 }

owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/http/methods/nonwebdav/DeleteMethod.kt

@@ -23,7 +23,7 @@
  */
 package com.owncloud.android.lib.common.http.methods.nonwebdav
 
-import com.owncloud.android.lib.common.http.HttpClient
+import okhttp3.OkHttpClient
 import java.io.IOException
 import java.net.URL
 
@@ -32,12 +32,12 @@ import java.net.URL
  *
  * @author David González Verdugo
  */
-class DeleteMethod(httpClient: HttpClient, url: URL) : HttpMethod(httpClient, url) {
+class DeleteMethod(url: URL) : HttpMethod(url) {
     @Throws(IOException::class)
-    override fun onExecute(): Int {
+    override fun onExecute(okHttpClient: OkHttpClient): Int {
         request = request.newBuilder()
             .delete()
             .build()
-        return super.onExecute()
+        return super.onExecute(okHttpClient)
     }
 }

owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/http/methods/nonwebdav/GetMethod.kt

@@ -23,7 +23,7 @@
  */
 package com.owncloud.android.lib.common.http.methods.nonwebdav
 
-import com.owncloud.android.lib.common.http.HttpClient
+import okhttp3.OkHttpClient
 import java.io.IOException
 import java.net.URL
 
@@ -32,12 +32,12 @@ import java.net.URL
  *
  * @author David González Verdugo
  */
-class GetMethod(httpClient: HttpClient, url: URL) : HttpMethod(httpClient, url) {
+class GetMethod(url: URL) : HttpMethod(url) {
     @Throws(IOException::class)
-    override fun onExecute(): Int {
+    override fun onExecute(okHttpClient: OkHttpClient): Int {
         request = request.newBuilder()
             .get()
             .build()
-        return super.onExecute()
+        return super.onExecute(okHttpClient)
     }
 }

owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/http/methods/nonwebdav/HttpMethod.kt

@@ -23,8 +23,8 @@
  */
 package com.owncloud.android.lib.common.http.methods.nonwebdav
 
-import com.owncloud.android.lib.common.http.HttpClient
 import com.owncloud.android.lib.common.http.methods.HttpBaseMethod
+import okhttp3.OkHttpClient
 import okhttp3.Response
 import java.net.URL
 
@@ -34,13 +34,12 @@ import java.net.URL
  * @author David González Verdugo
  */
 abstract class HttpMethod(
-    httpClient: HttpClient,
     url: URL
-) : HttpBaseMethod(httpClient, url) {
+) : HttpBaseMethod(url) {
 
     override lateinit var response: Response
 
-    public override fun onExecute(): Int {
+    public override fun onExecute(okHttpClient: OkHttpClient): Int {
         call = okHttpClient.newCall(request)
         call?.let { response = it.execute() }
         return super.statusCode

owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/http/methods/nonwebdav/PostMethod.kt

@@ -23,7 +23,7 @@
  */
 package com.owncloud.android.lib.common.http.methods.nonwebdav
 
-import com.owncloud.android.lib.common.http.HttpClient
+import okhttp3.OkHttpClient
 import okhttp3.RequestBody
 import java.io.IOException
 import java.net.URL
@@ -34,15 +34,14 @@ import java.net.URL
  * @author David González Verdugo
  */
 class PostMethod(
-    httpClient: HttpClient,
     url: URL,
     private val postRequestBody: RequestBody
-) : HttpMethod(httpClient, url) {
+) : HttpMethod(url) {
     @Throws(IOException::class)
-    override fun onExecute(): Int {
+    override fun onExecute(okHttpClient: OkHttpClient): Int {
         request = request.newBuilder()
             .post(postRequestBody)
             .build()
-        return super.onExecute()
+        return super.onExecute(okHttpClient)
     }
 }

owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/http/methods/nonwebdav/PutMethod.kt

@@ -23,7 +23,7 @@
  */
 package com.owncloud.android.lib.common.http.methods.nonwebdav
 
-import com.owncloud.android.lib.common.http.HttpClient
+import okhttp3.OkHttpClient
 import okhttp3.RequestBody
 import java.io.IOException
 import java.net.URL
@@ -34,15 +34,14 @@ import java.net.URL
  * @author David González Verdugo
  */
 class PutMethod(
-    httpClient: HttpClient,
     url: URL,
     private val putRequestBody: RequestBody
-) : HttpMethod(httpClient, url) {
+) : HttpMethod(url) {
     @Throws(IOException::class)
-    override fun onExecute(): Int {
+    override fun onExecute(okHttpClient: OkHttpClient): Int {
         request = request.newBuilder()
             .put(putRequestBody)
             .build()
-        return super.onExecute()
+        return super.onExecute(okHttpClient)
     }
 }

owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/http/methods/webdav/CopyMethod.kt

@@ -23,7 +23,7 @@
  */
 package com.owncloud.android.lib.common.http.methods.webdav
 
-import com.owncloud.android.lib.common.http.HttpClient
+import at.bitfire.dav4jvm.DavOCResource
 import okhttp3.Response
 import java.net.URL
 
@@ -34,13 +34,12 @@ import java.net.URL
  * @author David González Verdugo
  */
 class CopyMethod(
-    httpClient: HttpClient,
     val url: URL,
     private val destinationUrl: String,
     private val forceOverride: Boolean
-) : DavMethod(httpClient, url) {
+) : DavMethod(url) {
     @Throws(Exception::class)
-    public override fun onExecute(): Int {
+    public override fun onDavExecute(davResource: DavOCResource): Int {
         davResource.copy(
             destinationUrl,
             forceOverride,