diff --git a/library/src/androidTest/java/com/nextcloud/android/lib/resources/groupfolders/GetGroupfoldersRemoteOperationIT.kt b/library/src/androidTest/java/com/nextcloud/android/lib/resources/groupfolders/GetGroupfoldersRemoteOperationIT.kt index eee4c57ffd..8a915fb0bc 100644 --- a/library/src/androidTest/java/com/nextcloud/android/lib/resources/groupfolders/GetGroupfoldersRemoteOperationIT.kt +++ b/library/src/androidTest/java/com/nextcloud/android/lib/resources/groupfolders/GetGroupfoldersRemoteOperationIT.kt @@ -9,7 +9,6 @@ package com.nextcloud.android.lib.resources.groupfolders import com.owncloud.android.AbstractIT import com.owncloud.android.lib.resources.status.GetCapabilitiesRemoteOperation -import com.owncloud.android.lib.resources.status.OCCapability import org.junit.Assert.assertEquals import org.junit.Assume.assumeTrue import org.junit.Test @@ -17,7 +16,7 @@ import org.junit.Test class GetGroupfoldersRemoteOperationIT : AbstractIT() { @Test fun getGroupfolders() { - val capability = GetCapabilitiesRemoteOperation().execute(client).singleData as OCCapability + val capability = GetCapabilitiesRemoteOperation().execute(client).resultData assumeTrue(capability.groupfolders.isTrue) diff --git a/library/src/androidTest/java/com/nextcloud/android/lib/resources/search/SearchProvidersRemoteOperationIT.kt b/library/src/androidTest/java/com/nextcloud/android/lib/resources/search/SearchProvidersRemoteOperationIT.kt index 9e6cff1dc3..726324764a 100644 --- a/library/src/androidTest/java/com/nextcloud/android/lib/resources/search/SearchProvidersRemoteOperationIT.kt +++ b/library/src/androidTest/java/com/nextcloud/android/lib/resources/search/SearchProvidersRemoteOperationIT.kt @@ -9,7 +9,6 @@ package com.nextcloud.android.lib.resources.search import com.owncloud.android.AbstractIT import com.owncloud.android.lib.resources.status.GetCapabilitiesRemoteOperation -import com.owncloud.android.lib.resources.status.OCCapability import com.owncloud.android.lib.resources.status.OwnCloudVersion import org.junit.Assert.assertFalse import org.junit.Assert.assertNotNull @@ -38,10 +37,7 @@ class SearchProvidersRemoteOperationIT : AbstractIT() { @Test fun getSearchProvidersOnOldServer() { // only on < NC20 - val ocCapability = - GetCapabilitiesRemoteOperation() - .execute(nextcloudClient) - .singleData as OCCapability + val ocCapability = GetCapabilitiesRemoteOperation().execute(nextcloudClient).resultData assumeTrue( ocCapability.version.isOlderThan(OwnCloudVersion.nextcloud_20) ) diff --git a/library/src/androidTest/java/com/owncloud/android/AbstractIT.java b/library/src/androidTest/java/com/owncloud/android/AbstractIT.java index d36d360d1f..636c8aeee0 100644 --- a/library/src/androidTest/java/com/owncloud/android/AbstractIT.java +++ b/library/src/androidTest/java/com/owncloud/android/AbstractIT.java @@ -344,9 +344,7 @@ protected void longSleep() { } protected void testOnlyOnServer(OwnCloudVersion version) { - OCCapability ocCapability = (OCCapability) new GetCapabilitiesRemoteOperation() - .execute(nextcloudClient) - .getSingleData(); + OCCapability ocCapability = new GetCapabilitiesRemoteOperation().execute(nextcloudClient).getResultData(); assumeTrue(ocCapability.getVersion().isNewerOrEqual(version)); } } diff --git a/library/src/androidTest/java/com/owncloud/android/FileIT.java b/library/src/androidTest/java/com/owncloud/android/FileIT.java index eb85ea8198..a3e87e1962 100644 --- a/library/src/androidTest/java/com/owncloud/android/FileIT.java +++ b/library/src/androidTest/java/com/owncloud/android/FileIT.java @@ -154,8 +154,7 @@ public void testShareToGroupSharees() { ShareeUser sharee = new ShareeUser("users", "", ShareType.GROUP); // only on NC26+ - OCCapability ocCapability = (OCCapability) new GetCapabilitiesRemoteOperation() - .execute(nextcloudClient).getSingleData(); + OCCapability ocCapability = new GetCapabilitiesRemoteOperation().execute(nextcloudClient).getResultData(); if (ocCapability.getVersion().isNewerOrEqual(NextcloudVersion.nextcloud_26)) { sharee.setDisplayName("users"); } diff --git a/library/src/androidTest/java/com/owncloud/android/GetCapabilitiesRemoteOperationIT.java b/library/src/androidTest/java/com/owncloud/android/GetCapabilitiesRemoteOperationIT.java index a04d200278..9c3d42290e 100644 --- a/library/src/androidTest/java/com/owncloud/android/GetCapabilitiesRemoteOperationIT.java +++ b/library/src/androidTest/java/com/owncloud/android/GetCapabilitiesRemoteOperationIT.java @@ -36,28 +36,27 @@ public class GetCapabilitiesRemoteOperationIT extends AbstractIT { @Test public void testGetRemoteCapabilitiesOperation() { // get capabilities - RemoteOperationResult result = new GetCapabilitiesRemoteOperation().execute(client); + RemoteOperationResult result = new GetCapabilitiesRemoteOperation().execute(client); assertTrue(result.isSuccess()); - assertTrue(result.getData() != null && result.getData().size() == 1); + assertNotNull(result.getResultData()); - OCCapability capability = (OCCapability) result.getData().get(0); - checkCapability(capability, client.getUserId()); + checkCapability(result.getResultData(), client.getUserId()); } @Test public void testGetRemoteCapabilitiesOperationEtag() { // get capabilities - RemoteOperationResult result = new GetCapabilitiesRemoteOperation().execute(client); + RemoteOperationResult result = new GetCapabilitiesRemoteOperation().execute(client); assertTrue(result.isSuccess()); - assertTrue(result.getData() != null && result.getData().size() == 1); + assertNotNull(result.getResultData()); - OCCapability capability = (OCCapability) result.getData().get(0); + OCCapability capability = result.getResultData(); - RemoteOperationResult resultEtag = new GetCapabilitiesRemoteOperation(capability).execute(client); + RemoteOperationResult resultEtag = new GetCapabilitiesRemoteOperation(capability).execute(client); assertTrue(resultEtag.isSuccess()); - assertTrue(resultEtag.getData() != null && resultEtag.getData().size() == 1); + assertNotNull(result.getResultData()); - OCCapability sameCapability = (OCCapability) resultEtag.getData().get(0); + OCCapability sameCapability = resultEtag.getResultData(); if (capability.getVersion().isNewerOrEqual(OwnCloudVersion.nextcloud_19)) { assertEquals(capability, sameCapability); @@ -74,28 +73,27 @@ public void testGetRemoteCapabilitiesOperationEtag() { @Test public void testGetRemoteCapabilitiesOperationWithNextcloudClient() { // get capabilities - RemoteOperationResult result = new GetCapabilitiesRemoteOperation().execute(nextcloudClient); + RemoteOperationResult result = new GetCapabilitiesRemoteOperation().execute(nextcloudClient); assertTrue(result.isSuccess()); - assertTrue(result.getData() != null && result.getData().size() == 1); + assertNotNull(result.getResultData()); - OCCapability capability = (OCCapability) result.getData().get(0); - checkCapability(capability, client.getUserId()); + checkCapability(result.getResultData(), client.getUserId()); } @Test public void testGetRemoteCapabilitiesOperationEtagWithNextcloudClient() { // get capabilities - RemoteOperationResult result = new GetCapabilitiesRemoteOperation().execute(nextcloudClient); + RemoteOperationResult result = new GetCapabilitiesRemoteOperation().execute(nextcloudClient); assertTrue(result.isSuccess()); - assertTrue(result.getData() != null && result.getData().size() == 1); + assertNotNull(result.getResultData()); - OCCapability capability = (OCCapability) result.getData().get(0); + OCCapability capability = result.getResultData(); - RemoteOperationResult resultEtag = new GetCapabilitiesRemoteOperation(capability).execute(nextcloudClient); + RemoteOperationResult resultEtag = new GetCapabilitiesRemoteOperation(capability).execute(nextcloudClient); assertTrue(resultEtag.isSuccess()); - assertTrue(resultEtag.getData() != null && resultEtag.getData().size() == 1); + assertNotNull(result.getResultData()); - OCCapability sameCapability = (OCCapability) resultEtag.getData().get(0); + OCCapability sameCapability = resultEtag.getResultData(); if (capability.getVersion().isNewerOrEqual(OwnCloudVersion.nextcloud_19)) { assertEquals(capability, sameCapability); diff --git a/library/src/androidTest/java/com/owncloud/android/lib/common/operations/GetUserQuotaIT.java b/library/src/androidTest/java/com/owncloud/android/lib/common/operations/GetUserQuotaIT.java index c55f9a0f31..309155bb9b 100644 --- a/library/src/androidTest/java/com/owncloud/android/lib/common/operations/GetUserQuotaIT.java +++ b/library/src/androidTest/java/com/owncloud/android/lib/common/operations/GetUserQuotaIT.java @@ -41,8 +41,7 @@ public void testGetUserQuota() { assertNotNull(quota); - OCCapability capability = (OCCapability) new GetCapabilitiesRemoteOperation() - .execute(nextcloudClient).getSingleData(); + OCCapability capability = new GetCapabilitiesRemoteOperation().execute(nextcloudClient).getResultData(); if (capability.getVersion().isNewerOrEqual(NextcloudVersion.nextcloud_31)) { assertEquals(SPACE_UNLIMITED, quota.getFree()); diff --git a/library/src/androidTest/java/com/owncloud/android/lib/resources/files/FilesDownloadLimitIT.kt b/library/src/androidTest/java/com/owncloud/android/lib/resources/files/FilesDownloadLimitIT.kt index d17c7b57e6..e39020d408 100644 --- a/library/src/androidTest/java/com/owncloud/android/lib/resources/files/FilesDownloadLimitIT.kt +++ b/library/src/androidTest/java/com/owncloud/android/lib/resources/files/FilesDownloadLimitIT.kt @@ -79,8 +79,7 @@ class FilesDownloadLimitIT : AbstractIT() { } } - private fun getCapability(): OCCapability = - GetCapabilitiesRemoteOperation().execute(nextcloudClient).singleData as OCCapability + private fun getCapability(): OCCapability = GetCapabilitiesRemoteOperation().execute(nextcloudClient).resultData private fun createTestFile(): Boolean { val localPath = createFile("test") diff --git a/library/src/androidTest/java/com/owncloud/android/lib/resources/files/ReadFileRemoteOperationIT.kt b/library/src/androidTest/java/com/owncloud/android/lib/resources/files/ReadFileRemoteOperationIT.kt index 4f07000bb6..03d013b25c 100644 --- a/library/src/androidTest/java/com/owncloud/android/lib/resources/files/ReadFileRemoteOperationIT.kt +++ b/library/src/androidTest/java/com/owncloud/android/lib/resources/files/ReadFileRemoteOperationIT.kt @@ -15,7 +15,6 @@ import com.owncloud.android.lib.resources.files.model.ImageDimension import com.owncloud.android.lib.resources.files.model.RemoteFile import com.owncloud.android.lib.resources.status.GetCapabilitiesRemoteOperation import com.owncloud.android.lib.resources.status.NextcloudVersion -import com.owncloud.android.lib.resources.status.OCCapability import org.junit.Assert.assertEquals import org.junit.Assert.assertFalse import org.junit.Assert.assertTrue @@ -119,10 +118,7 @@ class ReadFileRemoteOperationIT : AbstractIT() { testOnlyOnServer(NextcloudVersion.nextcloud_27) - val ocCapability = - GetCapabilitiesRemoteOperation() - .execute(nextcloudClient) - .singleData as OCCapability + val ocCapability = GetCapabilitiesRemoteOperation().execute(nextcloudClient).resultData if (ocCapability.version.majorVersionNumber == NextcloudVersion.nextcloud_27.majorVersionNumber) { @Suppress("Detekt.MagicNumber") diff --git a/library/src/androidTest/java/com/owncloud/android/lib/resources/files/ReadFileVersionsRemoteOperationIT.kt b/library/src/androidTest/java/com/owncloud/android/lib/resources/files/ReadFileVersionsRemoteOperationIT.kt index 75e3de83ce..816112e116 100644 --- a/library/src/androidTest/java/com/owncloud/android/lib/resources/files/ReadFileVersionsRemoteOperationIT.kt +++ b/library/src/androidTest/java/com/owncloud/android/lib/resources/files/ReadFileVersionsRemoteOperationIT.kt @@ -11,7 +11,6 @@ import com.owncloud.android.AbstractIT import com.owncloud.android.lib.resources.files.model.RemoteFile import com.owncloud.android.lib.resources.status.GetCapabilitiesRemoteOperation import com.owncloud.android.lib.resources.status.NextcloudVersion -import com.owncloud.android.lib.resources.status.OCCapability import org.junit.Assert.assertEquals import org.junit.Assert.assertTrue import org.junit.Test @@ -41,10 +40,7 @@ class ReadFileVersionsRemoteOperationIT : AbstractIT() { assertTrue(sutResult.isSuccess) var versionCount = 0 - val ocCapability = - GetCapabilitiesRemoteOperation() - .execute(nextcloudClient) - .singleData as OCCapability + val ocCapability = GetCapabilitiesRemoteOperation().execute(nextcloudClient).resultData if (ocCapability.version.isNewerOrEqual(NextcloudVersion.nextcloud_26)) { // with NC26+ we always have a starting version versionCount++ diff --git a/library/src/androidTest/java/com/owncloud/android/lib/resources/files/SearchRemoteOperationIT.java b/library/src/androidTest/java/com/owncloud/android/lib/resources/files/SearchRemoteOperationIT.java index f16c50e8da..7ff006ffd4 100644 --- a/library/src/androidTest/java/com/owncloud/android/lib/resources/files/SearchRemoteOperationIT.java +++ b/library/src/androidTest/java/com/owncloud/android/lib/resources/files/SearchRemoteOperationIT.java @@ -37,9 +37,7 @@ public class SearchRemoteOperationIT extends AbstractIT { @BeforeClass public static void beforeClass() { - capability = (OCCapability) new GetCapabilitiesRemoteOperation(null) - .execute(client) - .getSingleData(); + capability = new GetCapabilitiesRemoteOperation(null).execute(client).getResultData(); } @Test diff --git a/library/src/androidTest/java/com/owncloud/android/lib/resources/shares/GetSharesRemoteOperationIT.java b/library/src/androidTest/java/com/owncloud/android/lib/resources/shares/GetSharesRemoteOperationIT.java index 58ed2ac252..4a7fc05c87 100644 --- a/library/src/androidTest/java/com/owncloud/android/lib/resources/shares/GetSharesRemoteOperationIT.java +++ b/library/src/androidTest/java/com/owncloud/android/lib/resources/shares/GetSharesRemoteOperationIT.java @@ -281,8 +281,7 @@ public void noFavorite() { @Test public void favorite() { // only on NC25+ - OCCapability ocCapability = (OCCapability) new GetCapabilitiesRemoteOperation() - .execute(nextcloudClient).getSingleData(); + OCCapability ocCapability = new GetCapabilitiesRemoteOperation().execute(nextcloudClient).getResultData(); assumeTrue(ocCapability.getVersion().isNewerOrEqual(NextcloudVersion.nextcloud_25)); String path = "/shareToAdminFavorite/"; diff --git a/library/src/androidTest/java/com/owncloud/android/lib/resources/shares/UpdateShareRemoteOperationIT.kt b/library/src/androidTest/java/com/owncloud/android/lib/resources/shares/UpdateShareRemoteOperationIT.kt index 359a71b5be..eeb4228cab 100644 --- a/library/src/androidTest/java/com/owncloud/android/lib/resources/shares/UpdateShareRemoteOperationIT.kt +++ b/library/src/androidTest/java/com/owncloud/android/lib/resources/shares/UpdateShareRemoteOperationIT.kt @@ -12,7 +12,6 @@ import com.owncloud.android.lib.resources.files.CreateFolderRemoteOperation import com.owncloud.android.lib.resources.files.RemoveFileRemoteOperation import com.owncloud.android.lib.resources.status.GetCapabilitiesRemoteOperation import com.owncloud.android.lib.resources.status.NextcloudVersion -import com.owncloud.android.lib.resources.status.OCCapability import org.junit.Assert.assertEquals import org.junit.Assert.assertFalse import org.junit.Assert.assertTrue @@ -187,7 +186,7 @@ class UpdateShareRemoteOperationIT : AbstractIT() { val capabilityResult = GetCapabilitiesRemoteOperation().execute(nextcloudClient) assertTrue(capabilityResult.isSuccess) - val capability = capabilityResult.singleData as OCCapability + val capability = capabilityResult.resultData when { capability.version.isNewerOrEqual(NextcloudVersion.nextcloud_22) -> { diff --git a/library/src/androidTest/java/com/owncloud/android/lib/resources/users/SetUserInfoRemoteOperationIT.java b/library/src/androidTest/java/com/owncloud/android/lib/resources/users/SetUserInfoRemoteOperationIT.java index 973fa48a52..ca2c52994d 100644 --- a/library/src/androidTest/java/com/owncloud/android/lib/resources/users/SetUserInfoRemoteOperationIT.java +++ b/library/src/androidTest/java/com/owncloud/android/lib/resources/users/SetUserInfoRemoteOperationIT.java @@ -64,9 +64,9 @@ public void testSetDisplayName() { @Test public void testSetPhone() { - RemoteOperationResult result = new GetCapabilitiesRemoteOperation().execute(nextcloudClient); + RemoteOperationResult result = new GetCapabilitiesRemoteOperation().execute(nextcloudClient); assertTrue(result.isSuccess()); - OCCapability ocCapability = (OCCapability) result.getSingleData(); + OCCapability ocCapability = result.getResultData(); RemoteOperationResult userInfo = new GetUserInfoRemoteOperation().execute(nextcloudClient); assertTrue(userInfo.isSuccess()); diff --git a/library/src/main/java/com/owncloud/android/lib/common/accounts/ExternalLinksOperation.java b/library/src/main/java/com/owncloud/android/lib/common/accounts/ExternalLinksOperation.java index 4d07dae77b..1d7233445c 100644 --- a/library/src/main/java/com/owncloud/android/lib/common/accounts/ExternalLinksOperation.java +++ b/library/src/main/java/com/owncloud/android/lib/common/accounts/ExternalLinksOperation.java @@ -56,9 +56,8 @@ protected RemoteOperationResult run(OwnCloudClient client) { try { // check capabilities - RemoteOperation getCapabilities = new GetCapabilitiesRemoteOperation(); - RemoteOperationResult capabilitiesResult = getCapabilities.execute(client); - OCCapability capability = (OCCapability) capabilitiesResult.getData().get(0); + RemoteOperationResult getCapabilities = new GetCapabilitiesRemoteOperation().execute(client); + OCCapability capability = getCapabilities.getResultData(); if (capability.getExternalLinks().isTrue()) { diff --git a/library/src/main/java/com/owncloud/android/lib/resources/status/GetCapabilitiesRemoteOperation.java b/library/src/main/java/com/owncloud/android/lib/resources/status/GetCapabilitiesRemoteOperation.java index d87dbf5d6b..7be5f2f8de 100644 --- a/library/src/main/java/com/owncloud/android/lib/resources/status/GetCapabilitiesRemoteOperation.java +++ b/library/src/main/java/com/owncloud/android/lib/resources/status/GetCapabilitiesRemoteOperation.java @@ -34,7 +34,7 @@ * * Save in Result.getData in a OCCapability object */ -public class GetCapabilitiesRemoteOperation extends RemoteOperation { +public class GetCapabilitiesRemoteOperation extends RemoteOperation { private static final String TAG = GetCapabilitiesRemoteOperation.class.getSimpleName(); @@ -189,8 +189,8 @@ public GetCapabilitiesRemoteOperation(OCCapability currentCapability) { } @Override - public RemoteOperationResult run(NextcloudClient client) { - RemoteOperationResult result; + public RemoteOperationResult run(NextcloudClient client) { + RemoteOperationResult result; int status; GetMethod get = null; @@ -212,7 +212,7 @@ public RemoteOperationResult run(NextcloudClient client) { if (isNotModified(status)) { Log_OC.d(TAG, "Capabilities not modified"); - result = new RemoteOperationResult(true, get); + result = new RemoteOperationResult<>(true, get); result.setSingleData(currentCapability); Log_OC.d(TAG, "*** Get Capabilities completed "); @@ -228,20 +228,16 @@ public RemoteOperationResult run(NextcloudClient client) { } // Result - result = new RemoteOperationResult(true, get); - result.setSingleData(capability); + result = new RemoteOperationResult<>(true, get); + result.setResultData(capability); } else { - result = new RemoteOperationResult(false, get); + result = new RemoteOperationResult<>(false, get); String response = get.getResponseBodyAsString(); Log_OC.e(TAG, "Failed response while getting capabilities from the server "); - if (response != null) { - Log_OC.e(TAG, "*** status code: " + status + "; response message: " + response); - } else { - Log_OC.e(TAG, "*** status code: " + status); - } + Log_OC.e(TAG, "*** status code: " + status + "; response message: " + response); } } catch (JSONException | IOException e) { - result = new RemoteOperationResult(e); + result = new RemoteOperationResult<>(e); Log_OC.e(TAG, "Exception while getting capabilities", e); } finally { @@ -253,8 +249,8 @@ public RemoteOperationResult run(NextcloudClient client) { } @Override - protected RemoteOperationResult run(OwnCloudClient client) { - RemoteOperationResult result; + protected RemoteOperationResult run(OwnCloudClient client) { + RemoteOperationResult result; int status; org.apache.commons.httpclient.methods.GetMethod get = null; @@ -277,7 +273,7 @@ protected RemoteOperationResult run(OwnCloudClient client) { if (isNotModified(status)) { Log_OC.d(TAG, "Capabilities not modified"); - result = new RemoteOperationResult(true, get); + result = new RemoteOperationResult<>(true, get); result.setSingleData(currentCapability); Log_OC.d(TAG, "*** Get Capabilities completed "); @@ -293,10 +289,10 @@ protected RemoteOperationResult run(OwnCloudClient client) { } // Result - result = new RemoteOperationResult(true, get); - result.setSingleData(capability); + result = new RemoteOperationResult<>(true, get); + result.setResultData(capability); } else { - result = new RemoteOperationResult(false, get); + result = new RemoteOperationResult<>(false, get); String response = get.getResponseBodyAsString(); Log_OC.e(TAG, "Failed response while getting capabilities from the server "); if (response != null) { @@ -306,7 +302,7 @@ protected RemoteOperationResult run(OwnCloudClient client) { } } } catch (JSONException | IOException e) { - result = new RemoteOperationResult(e); + result = new RemoteOperationResult<>(e); Log_OC.e(TAG, "Exception while getting capabilities", e); } finally {