From a9fbfd147d2d0d04cdfff9ebdf80487fa4460880 Mon Sep 17 00:00:00 2001 From: Gabriel Gamrat Date: Sun, 10 Mar 2019 19:28:00 +0100 Subject: [PATCH 1/2] refactor dbxClient instantiation test. --- .../dharmagate/configs/ApplicationConfig.java | 18 ++++++++++++++---- .../documents/Document/DropboxDocument.java | 6 +++++- .../integration/DropboxClientTests.java | 9 ++++++++- 3 files changed, 27 insertions(+), 6 deletions(-) diff --git a/src/main/java/pl/zazen/dharmagate/configs/ApplicationConfig.java b/src/main/java/pl/zazen/dharmagate/configs/ApplicationConfig.java index 02679a6..bb111c9 100644 --- a/src/main/java/pl/zazen/dharmagate/configs/ApplicationConfig.java +++ b/src/main/java/pl/zazen/dharmagate/configs/ApplicationConfig.java @@ -1,7 +1,9 @@ package pl.zazen.dharmagate.configs; +import com.dropbox.core.DbxException; import com.dropbox.core.DbxRequestConfig; import com.dropbox.core.v2.DbxClientV2; +import com.dropbox.core.v2.users.FullAccount; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -21,8 +23,16 @@ public class ApplicationConfig { @Bean @Profile("dev") public DbxClientV2 dropboxClient() { - DbxRequestConfig config = DbxRequestConfig.newBuilder("dropbox/java-tutorial").build(); - return new DbxClientV2(config, ACCESS_TOKEN); - } + DbxRequestConfig config = new DbxRequestConfig("dharmaGate/1.0"); + DbxClientV2 client = new DbxClientV2(config, ACCESS_TOKEN); + + try { + FullAccount account = client.users().getCurrentAccount(); + System.out.println(account.getName().getDisplayName()); + } catch (DbxException e) { + e.printStackTrace(); + } -} + return client; + } +} \ No newline at end of file diff --git a/src/main/java/pl/zazen/dharmagate/documents/Document/DropboxDocument.java b/src/main/java/pl/zazen/dharmagate/documents/Document/DropboxDocument.java index d691a06..0970fd2 100644 --- a/src/main/java/pl/zazen/dharmagate/documents/Document/DropboxDocument.java +++ b/src/main/java/pl/zazen/dharmagate/documents/Document/DropboxDocument.java @@ -1,16 +1,20 @@ package pl.zazen.dharmagate.documents.Document; +import lombok.NoArgsConstructor; + import java.io.InputStream; +@NoArgsConstructor public class DropboxDocument implements Document { private InputStream inputStream; - private DropboxDocument() {} + //private DropboxDocument() {} public static DropboxDocument fromInputStream(InputStream inputStream) { DropboxDocument dropboxDocument = new DropboxDocument(); dropboxDocument.inputStream = inputStream; return dropboxDocument; } + } diff --git a/src/test/java/pl/zazen/dharmagate/integration/DropboxClientTests.java b/src/test/java/pl/zazen/dharmagate/integration/DropboxClientTests.java index f624811..853a4d9 100644 --- a/src/test/java/pl/zazen/dharmagate/integration/DropboxClientTests.java +++ b/src/test/java/pl/zazen/dharmagate/integration/DropboxClientTests.java @@ -20,7 +20,14 @@ public class DropboxClientTests { @Test public void dbxClientBean_ShouldBeInstantiated() { - assertThat(dbxClient).isNotNull(); + try{ + assertThat(dbxClient.users().getCurrentAccount().getCountry()).isEqualTo("PL"); + }catch (DbxException e){ + e.getMessage(); + } + + //assertThat(dbxClient).isNotNull(); + } @Test From a6b0c1c9c32db2199ef56875faa5a65a51b05d1a Mon Sep 17 00:00:00 2001 From: Gabriel Gamrat Date: Mon, 11 Mar 2019 22:47:11 +0100 Subject: [PATCH 2/2] using lombok. --- .../dharmagate/documents/DefaultDocumentService.java | 8 ++------ .../documents/Document/DropboxDocument.java | 12 +++--------- .../Document/DropboxDocumentRepository.java | 6 ++---- 3 files changed, 7 insertions(+), 19 deletions(-) diff --git a/src/main/java/pl/zazen/dharmagate/documents/DefaultDocumentService.java b/src/main/java/pl/zazen/dharmagate/documents/DefaultDocumentService.java index 6f11949..757bba4 100644 --- a/src/main/java/pl/zazen/dharmagate/documents/DefaultDocumentService.java +++ b/src/main/java/pl/zazen/dharmagate/documents/DefaultDocumentService.java @@ -1,5 +1,6 @@ package pl.zazen.dharmagate.documents; +import lombok.AllArgsConstructor; import org.springframework.stereotype.Service; import org.thymeleaf.util.Validate; import pl.zazen.dharmagate.documents.Document.Document; @@ -8,17 +9,12 @@ import pl.zazen.dharmagate.documents.DocumentInformation.DocumentInformationService; @Service +@AllArgsConstructor public class DefaultDocumentService implements DocumentService { private DocumentInformationService documentInformationService; private DropboxDocumentRepository dropboxDocumentRepository; - public DefaultDocumentService(DocumentInformationService documentInformationService, - DropboxDocumentRepository dropboxDocumentRepository) { - this.documentInformationService = documentInformationService; - this.dropboxDocumentRepository = dropboxDocumentRepository; - } - @Override public Document getByHash(String hash) { Validate.notNull(hash, "id cannot be null"); diff --git a/src/main/java/pl/zazen/dharmagate/documents/Document/DropboxDocument.java b/src/main/java/pl/zazen/dharmagate/documents/Document/DropboxDocument.java index 0970fd2..82cfc1c 100644 --- a/src/main/java/pl/zazen/dharmagate/documents/Document/DropboxDocument.java +++ b/src/main/java/pl/zazen/dharmagate/documents/Document/DropboxDocument.java @@ -1,20 +1,14 @@ package pl.zazen.dharmagate.documents.Document; -import lombok.NoArgsConstructor; - +import lombok.AllArgsConstructor; import java.io.InputStream; -@NoArgsConstructor +@AllArgsConstructor public class DropboxDocument implements Document { private InputStream inputStream; - //private DropboxDocument() {} - public static DropboxDocument fromInputStream(InputStream inputStream) { - DropboxDocument dropboxDocument = new DropboxDocument(); - dropboxDocument.inputStream = inputStream; - return dropboxDocument; + return new DropboxDocument(inputStream); } - } diff --git a/src/main/java/pl/zazen/dharmagate/documents/Document/DropboxDocumentRepository.java b/src/main/java/pl/zazen/dharmagate/documents/Document/DropboxDocumentRepository.java index 77b2829..78d36bf 100644 --- a/src/main/java/pl/zazen/dharmagate/documents/Document/DropboxDocumentRepository.java +++ b/src/main/java/pl/zazen/dharmagate/documents/Document/DropboxDocumentRepository.java @@ -4,18 +4,16 @@ import com.dropbox.core.DbxException; import com.dropbox.core.v2.DbxClientV2; import com.dropbox.core.v2.files.FileMetadata; +import lombok.AllArgsConstructor; import org.springframework.stereotype.Repository; import org.thymeleaf.util.Validate; @Repository +@AllArgsConstructor public class DropboxDocumentRepository implements DocumentRepository { private DbxClientV2 dropboxClient; - public DropboxDocumentRepository(DbxClientV2 dropboxClient) { - this.dropboxClient = dropboxClient; - } - @Override public Document getByPath(String path) { Validate.notNull(path, "path cannot be null");