Migrate webdav wrappers to kotlin

Author: abelgardep

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

@@ -21,37 +21,28 @@
  *   THE SOFTWARE.
  *
  */
+package com.owncloud.android.lib.common.http.methods.webdav
 
-package com.owncloud.android.lib.common.http.methods.webdav;
-
-import kotlin.Unit;
-
-import java.net.URL;
+import okhttp3.Response
+import java.net.URL
 
 /**
  * Copy calls wrapper
  *
  * @author Christian Schabesberger
  * @author David González Verdugo
  */
-public class CopyMethod extends DavMethod {
-
-    final String destinationUrl;
-    final boolean forceOverride;
-
-    public CopyMethod(URL url, String destinationUrl, boolean forceOverride) {
-        super(url);
-        this.destinationUrl = destinationUrl;
-        this.forceOverride = forceOverride;
+class CopyMethod(
+    val url: URL?,
+    private val destinationUrl: String,
+    private val forceOverride: Boolean
+) : DavMethod(url) {
+    @Throws(Exception::class)
+    public override fun onExecute(): Int {
+        mDavResource.copy(destinationUrl, forceOverride) { response: Response ->
+            mResponse = response
+        }
+        return super.getStatusCode()
     }
 
-    @Override
-    public int onExecute() throws Exception {
-        mDavResource.copy(destinationUrl, forceOverride, response -> {
-            mResponse = response;
-            return Unit.INSTANCE;
-        });
-
-        return super.getStatusCode();
-    }
-}
+}

owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/http/methods/webdav/DavConstants.java renamed to owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/http/methods/webdav/DavConstants.kt

@@ -21,13 +21,12 @@
  *   THE SOFTWARE.
  *
  */
-
-package com.owncloud.android.lib.common.http.methods.webdav;
+package com.owncloud.android.lib.common.http.methods.webdav
 
 /**
  * @author David González Verdugo
  */
-public class DavConstants {
-    public static final int DEPTH_0 = 0;
-    public static final int DEPTH_1 = 1;
+object DavConstants {
+    const val DEPTH_0 = 0
+    const val DEPTH_1 = 1
 }

owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/http/methods/webdav/MkColMethod.java renamed to owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/http/methods/webdav/MkColMethod.kt

@@ -21,31 +21,23 @@
  *   THE SOFTWARE.
  *
  */
+package com.owncloud.android.lib.common.http.methods.webdav
 
-package com.owncloud.android.lib.common.http.methods.webdav;
-
-import kotlin.Unit;
-
-import java.net.URL;
+import okhttp3.Response
+import java.net.URL
 
 /**
  * MkCol calls wrapper
  *
  * @author Christian Schabesberger
  * @author David González Verdugo
  */
-public class MkColMethod extends DavMethod {
-    public MkColMethod(URL url) {
-        super(url);
-    }
-
-    @Override
-    public int onExecute() throws Exception {
-        mDavResource.mkCol(null, response -> {
-            mResponse = response;
-            return Unit.INSTANCE;
-        });
-
-        return super.getStatusCode();
+class MkColMethod(url: URL?) : DavMethod(url) {
+    @Throws(Exception::class)
+    public override fun onExecute(): Int {
+        mDavResource.mkCol(null) { response: Response ->
+            mResponse = response
+        }
+        return super.getStatusCode()
     }
-}
+}

owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/http/methods/webdav/MoveMethod.java renamed to owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/http/methods/webdav/MoveMethod.kt

@@ -21,41 +21,35 @@
  *   THE SOFTWARE.
  *
  */
+package com.owncloud.android.lib.common.http.methods.webdav
 
-package com.owncloud.android.lib.common.http.methods.webdav;
-
-import com.owncloud.android.lib.common.http.HttpConstants;
-import kotlin.Unit;
-
-import java.net.URL;
+import com.owncloud.android.lib.common.http.HttpConstants
+import okhttp3.Response
+import java.net.URL
 
 /**
  * Move calls wrapper
  *
  * @author Christian Schabesberger
  * @author David González Verdugo
  */
-public class MoveMethod extends DavMethod {
-    final String destinationUrl;
-    final boolean forceOverride;
-
-    public MoveMethod(URL url, String destinationUrl, boolean forceOverride) {
-        super(url);
-        this.destinationUrl = destinationUrl;
-        this.forceOverride = forceOverride;
-    }
-
-    @Override
-    public int onExecute() throws Exception {
+class MoveMethod(
+    url: URL?,
+    private val destinationUrl: String,
+    private val forceOverride: Boolean
+) :
+    DavMethod(url) {
+    @Throws(Exception::class)
+    public override fun onExecute(): Int {
         mDavResource.move(
-                destinationUrl,
-                forceOverride,
-                super.getRequestHeader(HttpConstants.OC_TOTAL_LENGTH_HEADER),
-                super.getRequestHeader(HttpConstants.OC_X_OC_MTIME_HEADER), response -> {
-                    mResponse = response;
-                    return Unit.INSTANCE;
-                });
-
-        return super.getStatusCode();
+            destinationUrl,
+            forceOverride,
+            super.getRequestHeader(HttpConstants.OC_TOTAL_LENGTH_HEADER),
+            super.getRequestHeader(HttpConstants.OC_X_OC_MTIME_HEADER)
+        ) { response: Response ->
+            mResponse = response
+        }
+        return super.getStatusCode()
     }
-}
+
+}

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

@@ -0,0 +1,78 @@
+/* ownCloud Android Library is available under MIT license
+ *   Copyright (C) 2020 ownCloud GmbH.
+ *
+ *   Permission is hereby granted, free of charge, to any person obtaining a copy
+ *   of this software and associated documentation files (the "Software"), to deal
+ *   in the Software without restriction, including without limitation the rights
+ *   to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ *   copies of the Software, and to permit persons to whom the Software is
+ *   furnished to do so, subject to the following conditions:
+ *
+ *   The above copyright notice and this permission notice shall be included in
+ *   all copies or substantial portions of the Software.
+ *
+ *   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ *   EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ *   MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ *   NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ *   BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ *   ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ *   CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ *   THE SOFTWARE.
+ *
+ */
+package com.owncloud.android.lib.common.http.methods.webdav
+
+import at.bitfire.dav4android.Property
+import at.bitfire.dav4android.Response
+import at.bitfire.dav4android.Response.HrefRelation
+import at.bitfire.dav4android.exception.DavException
+import java.io.IOException
+import java.net.URL
+import java.util.ArrayList
+
+/**
+ * Propfind calls wrapper
+ *
+ * @author David González Verdugo
+ */
+class PropfindMethod(
+    url: URL?,
+    // request
+    val depth: Int,
+    private val mPropertiesToRequest: Array<Property.Name>
+) : DavMethod(url) {
+
+    // response
+    private val mMembers: MutableList<Response>
+    var root: Response?
+        private set
+
+    @Throws(IOException::class, DavException::class)
+    public override fun onExecute(): Int {
+        mDavResource.propfind(
+            depth = depth,
+            reqProp = *mPropertiesToRequest,
+            callback = { response: Response, hrefRelation: HrefRelation? ->
+                when (hrefRelation) {
+                    HrefRelation.MEMBER -> mMembers.add(response)
+                    HrefRelation.SELF -> this.root = response
+                    HrefRelation.OTHER -> {
+                    }
+                    else -> {
+                    }
+                }
+            }, rawCallback = { response: okhttp3.Response ->
+                mResponse = response
+            })
+        return statusCode
+    }
+
+    val members: List<Response>
+        get() = mMembers
+
+    init {
+        mMembers = ArrayList()
+        this.root = null
+    }
+}