Repository: camel Updated Branches: refs/heads/master b3fed9d77 -> 5ebf252c2
Polish the code of camel-dropbox Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/83f43417 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/83f43417 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/83f43417 Branch: refs/heads/master Commit: 83f434179edb78d5edd97c32c37217e789d21d41 Parents: a0b87d9 Author: Willem Jiang <willem.ji...@gmail.com> Authored: Fri Jun 6 14:31:53 2014 +0800 Committer: Willem Jiang <willem.ji...@gmail.com> Committed: Fri Jun 6 14:42:41 2014 +0800 ---------------------------------------------------------------------- .../component/dropbox/core/DropboxAPIFacade.java | 18 +++++++++--------- .../component/dropbox/dto/DropboxDelResult.java | 6 +----- .../component/dropbox/dto/DropboxMoveResult.java | 6 +----- .../dropbox/dto/DropboxSearchResult.java | 5 +---- .../integration/producer/DropboxDelProducer.java | 5 +---- .../integration/producer/DropboxMoveProducer.java | 5 +---- .../producer/DropboxSearchProducer.java | 5 +---- 7 files changed, 15 insertions(+), 35 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/83f43417/components/camel-dropbox/src/main/java/org/apache/camel/component/dropbox/core/DropboxAPIFacade.java ---------------------------------------------------------------------- diff --git a/components/camel-dropbox/src/main/java/org/apache/camel/component/dropbox/core/DropboxAPIFacade.java b/components/camel-dropbox/src/main/java/org/apache/camel/component/dropbox/core/DropboxAPIFacade.java index aba52f6..9edfcc6 100755 --- a/components/camel-dropbox/src/main/java/org/apache/camel/component/dropbox/core/DropboxAPIFacade.java +++ b/components/camel-dropbox/src/main/java/org/apache/camel/component/dropbox/core/DropboxAPIFacade.java @@ -63,7 +63,7 @@ public final class DropboxAPIFacade { public static DropboxAPIFacade getInstance(DbxClient client) { if (instance == null) { instance = new DropboxAPIFacade(); - instance.client = client; + DropboxAPIFacade.client = client; } return instance; } @@ -87,7 +87,7 @@ public final class DropboxAPIFacade { String dropboxPath = remotePath == null ? localPath : remotePath; DbxEntry entry = null; try { - entry = instance.client.getMetadata(dropboxPath); + entry = DropboxAPIFacade.client.getMetadata(dropboxPath); } catch (DbxException e) { throw new DropboxException(dropboxPath + " does not exist or can't obtain metadata"); } @@ -173,7 +173,7 @@ public final class DropboxAPIFacade { uploadMode = DbxWriteMode.add(); } uploadedFile = - instance.client.uploadFile(dropboxPath, + DropboxAPIFacade.client.uploadFile(dropboxPath, uploadMode, inputFile.length(), inputStream); return uploadedFile; } finally { @@ -195,7 +195,7 @@ public final class DropboxAPIFacade { if (query == null) { LOG.info("search no query"); try { - listing = instance.client.getMetadataWithChildren(remotePath); + listing = DropboxAPIFacade.client.getMetadataWithChildren(remotePath); } catch (DbxException e) { throw new DropboxException(remotePath + " does not exist or can't obtain metadata"); } @@ -204,7 +204,7 @@ public final class DropboxAPIFacade { LOG.info("search by query:" + query); List<DbxEntry> entries = null; try { - entries = instance.client.searchFileAndFolderNames(remotePath, query); + entries = DropboxAPIFacade.client.searchFileAndFolderNames(remotePath, query); } catch (DbxException e) { throw new DropboxException(remotePath + " does not exist or can't obtain metadata"); } @@ -223,7 +223,7 @@ public final class DropboxAPIFacade { public DropboxResult del(String remotePath) throws DropboxException { DropboxResult result = null; try { - instance.client.delete(remotePath); + DropboxAPIFacade.client.delete(remotePath); } catch (DbxException e) { throw new DropboxException(remotePath + " does not exist or can't obtain metadata"); } @@ -242,7 +242,7 @@ public final class DropboxAPIFacade { public DropboxResult move(String remotePath, String newRemotePath) throws DropboxException { DropboxResult result = null; try { - instance.client.move(remotePath, newRemotePath); + DropboxAPIFacade.client.move(remotePath, newRemotePath); } catch (DbxException e) { throw new DropboxException(remotePath + " does not exist or can't obtain metadata"); } @@ -271,7 +271,7 @@ public final class DropboxAPIFacade { private void downloadFilesInFolder(String path, Map<String, ByteArrayOutputStream> resultEntries) throws DropboxException { DbxEntry.WithChildren listing = null; try { - listing = instance.client.getMetadataWithChildren(path); + listing = DropboxAPIFacade.client.getMetadataWithChildren(path); } catch (DbxException e) { throw new DropboxException(path + " does not exist or can't obtain metadata"); } @@ -299,7 +299,7 @@ public final class DropboxAPIFacade { ByteArrayOutputStream baos = new ByteArrayOutputStream(); DbxEntry.File downloadedFile; try { - downloadedFile = instance.client.getFile(path, null, baos); + downloadedFile = DropboxAPIFacade.client.getFile(path, null, baos); } catch (DbxException e) { throw new DropboxException(path + " does not exist or can't obtain metadata"); } catch (IOException e) { http://git-wip-us.apache.org/repos/asf/camel/blob/83f43417/components/camel-dropbox/src/main/java/org/apache/camel/component/dropbox/dto/DropboxDelResult.java ---------------------------------------------------------------------- diff --git a/components/camel-dropbox/src/main/java/org/apache/camel/component/dropbox/dto/DropboxDelResult.java b/components/camel-dropbox/src/main/java/org/apache/camel/component/dropbox/dto/DropboxDelResult.java index 50ed909..1963c11 100755 --- a/components/camel-dropbox/src/main/java/org/apache/camel/component/dropbox/dto/DropboxDelResult.java +++ b/components/camel-dropbox/src/main/java/org/apache/camel/component/dropbox/dto/DropboxDelResult.java @@ -18,13 +18,9 @@ package org.apache.camel.component.dropbox.dto; import org.apache.camel.Exchange; import org.apache.camel.component.dropbox.util.DropboxResultHeader; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; public class DropboxDelResult extends DropboxResult { - - private static final transient Logger LOG = LoggerFactory.getLogger(DropboxDelResult.class); - + /** * Object payload contained in Exchange * Exchange Body is populated with the remote path deleted on dropbox. http://git-wip-us.apache.org/repos/asf/camel/blob/83f43417/components/camel-dropbox/src/main/java/org/apache/camel/component/dropbox/dto/DropboxMoveResult.java ---------------------------------------------------------------------- diff --git a/components/camel-dropbox/src/main/java/org/apache/camel/component/dropbox/dto/DropboxMoveResult.java b/components/camel-dropbox/src/main/java/org/apache/camel/component/dropbox/dto/DropboxMoveResult.java index 8337f62..fd4e171 100755 --- a/components/camel-dropbox/src/main/java/org/apache/camel/component/dropbox/dto/DropboxMoveResult.java +++ b/components/camel-dropbox/src/main/java/org/apache/camel/component/dropbox/dto/DropboxMoveResult.java @@ -18,14 +18,10 @@ package org.apache.camel.component.dropbox.dto; import org.apache.camel.Exchange; import org.apache.camel.component.dropbox.util.DropboxResultHeader; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; public class DropboxMoveResult extends DropboxResult { - - private static final transient Logger LOG = LoggerFactory.getLogger(DropboxMoveResult.class); - + /** * Object payload contained in Exchange * Exchange Header and Body contains the mode path http://git-wip-us.apache.org/repos/asf/camel/blob/83f43417/components/camel-dropbox/src/main/java/org/apache/camel/component/dropbox/dto/DropboxSearchResult.java ---------------------------------------------------------------------- diff --git a/components/camel-dropbox/src/main/java/org/apache/camel/component/dropbox/dto/DropboxSearchResult.java b/components/camel-dropbox/src/main/java/org/apache/camel/component/dropbox/dto/DropboxSearchResult.java index 97a5972..b17a48a 100755 --- a/components/camel-dropbox/src/main/java/org/apache/camel/component/dropbox/dto/DropboxSearchResult.java +++ b/components/camel-dropbox/src/main/java/org/apache/camel/component/dropbox/dto/DropboxSearchResult.java @@ -19,16 +19,13 @@ package org.apache.camel.component.dropbox.dto; import java.util.List; import com.dropbox.core.DbxEntry; + import org.apache.camel.Exchange; import org.apache.camel.component.dropbox.util.DropboxResultHeader; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; public class DropboxSearchResult extends DropboxResult { - private static final transient Logger LOG = LoggerFactory.getLogger(DropboxSearchResult.class); - /** * Object payload contained in Exchange * Exchange Header is populated with the remote paths found. http://git-wip-us.apache.org/repos/asf/camel/blob/83f43417/components/camel-dropbox/src/main/java/org/apache/camel/component/dropbox/integration/producer/DropboxDelProducer.java ---------------------------------------------------------------------- diff --git a/components/camel-dropbox/src/main/java/org/apache/camel/component/dropbox/integration/producer/DropboxDelProducer.java b/components/camel-dropbox/src/main/java/org/apache/camel/component/dropbox/integration/producer/DropboxDelProducer.java index f81ed34..4b2128e 100755 --- a/components/camel-dropbox/src/main/java/org/apache/camel/component/dropbox/integration/producer/DropboxDelProducer.java +++ b/components/camel-dropbox/src/main/java/org/apache/camel/component/dropbox/integration/producer/DropboxDelProducer.java @@ -21,12 +21,9 @@ import org.apache.camel.component.dropbox.DropboxConfiguration; import org.apache.camel.component.dropbox.DropboxEndpoint; import org.apache.camel.component.dropbox.core.DropboxAPIFacade; import org.apache.camel.component.dropbox.dto.DropboxResult; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; public class DropboxDelProducer extends DropboxProducer { - private static final transient Logger LOG = LoggerFactory.getLogger(DropboxDelProducer.class); - + public DropboxDelProducer(DropboxEndpoint endpoint, DropboxConfiguration configuration) { super(endpoint, configuration); } http://git-wip-us.apache.org/repos/asf/camel/blob/83f43417/components/camel-dropbox/src/main/java/org/apache/camel/component/dropbox/integration/producer/DropboxMoveProducer.java ---------------------------------------------------------------------- diff --git a/components/camel-dropbox/src/main/java/org/apache/camel/component/dropbox/integration/producer/DropboxMoveProducer.java b/components/camel-dropbox/src/main/java/org/apache/camel/component/dropbox/integration/producer/DropboxMoveProducer.java index 7ab6142..0ca0fce 100755 --- a/components/camel-dropbox/src/main/java/org/apache/camel/component/dropbox/integration/producer/DropboxMoveProducer.java +++ b/components/camel-dropbox/src/main/java/org/apache/camel/component/dropbox/integration/producer/DropboxMoveProducer.java @@ -21,12 +21,9 @@ import org.apache.camel.component.dropbox.DropboxConfiguration; import org.apache.camel.component.dropbox.DropboxEndpoint; import org.apache.camel.component.dropbox.core.DropboxAPIFacade; import org.apache.camel.component.dropbox.dto.DropboxResult; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; public class DropboxMoveProducer extends DropboxProducer { - private static final transient Logger LOG = LoggerFactory.getLogger(DropboxMoveProducer.class); - + public DropboxMoveProducer(DropboxEndpoint endpoint, DropboxConfiguration configuration) { super(endpoint, configuration); } http://git-wip-us.apache.org/repos/asf/camel/blob/83f43417/components/camel-dropbox/src/main/java/org/apache/camel/component/dropbox/integration/producer/DropboxSearchProducer.java ---------------------------------------------------------------------- diff --git a/components/camel-dropbox/src/main/java/org/apache/camel/component/dropbox/integration/producer/DropboxSearchProducer.java b/components/camel-dropbox/src/main/java/org/apache/camel/component/dropbox/integration/producer/DropboxSearchProducer.java index d15e91e..c924ad6 100755 --- a/components/camel-dropbox/src/main/java/org/apache/camel/component/dropbox/integration/producer/DropboxSearchProducer.java +++ b/components/camel-dropbox/src/main/java/org/apache/camel/component/dropbox/integration/producer/DropboxSearchProducer.java @@ -21,12 +21,9 @@ import org.apache.camel.component.dropbox.DropboxConfiguration; import org.apache.camel.component.dropbox.DropboxEndpoint; import org.apache.camel.component.dropbox.core.DropboxAPIFacade; import org.apache.camel.component.dropbox.dto.DropboxResult; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; public class DropboxSearchProducer extends DropboxProducer { - private static final transient Logger LOG = LoggerFactory.getLogger(DropboxSearchProducer.class); - + public DropboxSearchProducer(DropboxEndpoint endpoint, DropboxConfiguration configuration) { super(endpoint, configuration); }
