This is an automated email from the ASF dual-hosted git repository. turcsanyi pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/nifi.git
The following commit(s) were added to refs/heads/main by this push: new 3115b9f28d NIFI-10803 - Upgrade Dropbox SDK to 5.4.4 3115b9f28d is described below commit 3115b9f28d6b84930c950f27247b86fa8ff5970c Author: Pierre Villard <pierre.villard...@gmail.com> AuthorDate: Sat Feb 18 18:12:48 2023 -0500 NIFI-10803 - Upgrade Dropbox SDK to 5.4.4 This closes #6971. Reviewed-by: krisztina-zsihovszki <zsikr...@gmail.com> Signed-off-by: Peter Turcsanyi <turcsa...@apache.org> --- .../src/main/java/org/apache/nifi/processors/dropbox/ListDropbox.java | 4 ++-- .../test/java/org/apache/nifi/processors/dropbox/ListDropboxTest.java | 4 ++-- nifi-nar-bundles/nifi-dropbox-bundle/pom.xml | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/nifi-nar-bundles/nifi-dropbox-bundle/nifi-dropbox-processors/src/main/java/org/apache/nifi/processors/dropbox/ListDropbox.java b/nifi-nar-bundles/nifi-dropbox-bundle/nifi-dropbox-processors/src/main/java/org/apache/nifi/processors/dropbox/ListDropbox.java index e0b5373e17..9005b37314 100644 --- a/nifi-nar-bundles/nifi-dropbox-bundle/nifi-dropbox-processors/src/main/java/org/apache/nifi/processors/dropbox/ListDropbox.java +++ b/nifi-nar-bundles/nifi-dropbox-bundle/nifi-dropbox-processors/src/main/java/org/apache/nifi/processors/dropbox/ListDropbox.java @@ -33,8 +33,8 @@ import static org.apache.nifi.processors.dropbox.DropboxAttributes.TIMESTAMP_DES import com.dropbox.core.DbxException; import com.dropbox.core.v2.DbxClientV2; +import com.dropbox.core.v2.files.DbxUserListFolderBuilder; import com.dropbox.core.v2.files.FileMetadata; -import com.dropbox.core.v2.files.ListFolderBuilder; import com.dropbox.core.v2.files.ListFolderResult; import java.io.IOException; import java.util.ArrayList; @@ -201,7 +201,7 @@ public class ListDropbox extends AbstractListProcessor<DropboxFileInfo> implemen try { Predicate<FileMetadata> metadataFilter = createMetadataFilter(minTimestamp, minAge); - final ListFolderBuilder listFolderBuilder = dropboxApiClient.files().listFolderBuilder(convertFolderName(folderName)); + final DbxUserListFolderBuilder listFolderBuilder = dropboxApiClient.files().listFolderBuilder(convertFolderName(folderName)); ListFolderResult result = listFolderBuilder .withRecursive(recursive) .start(); diff --git a/nifi-nar-bundles/nifi-dropbox-bundle/nifi-dropbox-processors/src/test/java/org/apache/nifi/processors/dropbox/ListDropboxTest.java b/nifi-nar-bundles/nifi-dropbox-bundle/nifi-dropbox-processors/src/test/java/org/apache/nifi/processors/dropbox/ListDropboxTest.java index be08c2dc94..6b14b5d2f6 100644 --- a/nifi-nar-bundles/nifi-dropbox-bundle/nifi-dropbox-processors/src/test/java/org/apache/nifi/processors/dropbox/ListDropboxTest.java +++ b/nifi-nar-bundles/nifi-dropbox-bundle/nifi-dropbox-processors/src/test/java/org/apache/nifi/processors/dropbox/ListDropboxTest.java @@ -26,8 +26,8 @@ import static org.mockito.Mockito.when; import com.dropbox.core.DbxException; import com.dropbox.core.v2.DbxClientV2; import com.dropbox.core.v2.files.DbxUserFilesRequests; +import com.dropbox.core.v2.files.DbxUserListFolderBuilder; import com.dropbox.core.v2.files.FolderMetadata; -import com.dropbox.core.v2.files.ListFolderBuilder; import com.dropbox.core.v2.files.ListFolderResult; import com.dropbox.core.v2.files.Metadata; import com.fasterxml.jackson.core.JsonProcessingException; @@ -69,7 +69,7 @@ public class ListDropboxTest extends AbstractDropboxTest { private ListFolderResult mockListFolderResult; @Mock - private ListFolderBuilder mockListFolderBuilder; + private DbxUserListFolderBuilder mockListFolderBuilder; @BeforeEach protected void setUp() throws Exception { diff --git a/nifi-nar-bundles/nifi-dropbox-bundle/pom.xml b/nifi-nar-bundles/nifi-dropbox-bundle/pom.xml index c24fef70d2..dc7c2d293f 100644 --- a/nifi-nar-bundles/nifi-dropbox-bundle/pom.xml +++ b/nifi-nar-bundles/nifi-dropbox-bundle/pom.xml @@ -27,7 +27,7 @@ <packaging>pom</packaging> <properties> - <dropbox.client.version>4.0.1</dropbox.client.version> + <dropbox.client.version>5.4.4</dropbox.client.version> </properties> <modules>