Repository: camel
Updated Branches:
  refs/heads/master d896f569d -> e4ba8a7bd


Prefix headers with CamelDropbox.
Move header declaration from enum to DropboxConstants interface as plain String.


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/e4ba8a7b
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/e4ba8a7b
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/e4ba8a7b

Branch: refs/heads/master
Commit: e4ba8a7bd448193da89ddadcc03cfdff1ce8d433
Parents: f0b67e6
Author: Thomas Lehoux <[email protected]>
Authored: Sun May 28 16:26:02 2017 +0200
Committer: Claus Ibsen <[email protected]>
Committed: Sun May 28 16:41:58 2017 +0200

----------------------------------------------------------------------
 .../component/dropbox/DropboxEndpoint.java      |  7 ++--
 .../dropbox/core/DropboxAPIFacade.java          | 18 +++++-----
 .../producer/DropboxDelProducer.java            |  2 --
 .../producer/DropboxGetProducer.java            |  2 --
 .../producer/DropboxMoveProducer.java           |  2 --
 .../producer/DropboxPutProducer.java            |  2 --
 .../producer/DropboxSearchProducer.java         |  2 --
 .../dropbox/util/DropboxConstants.java          | 13 +++++---
 .../component/dropbox/util/DropboxHelper.java   | 20 +++++------
 .../dropbox/util/DropboxRequestHeader.java      | 35 --------------------
 .../DropboxConfigurationValidator.java          |  7 ++--
 .../producer/DropboxProducerDelTest.java        |  4 +--
 .../producer/DropboxProducerGetFolderTest.java  |  8 ++---
 .../producer/DropboxProducerGetSingleTest.java  |  4 +--
 .../producer/DropboxProducerMoveTest.java       |  6 ++--
 .../DropboxProducerPutSingleFileTest.java       |  6 ++--
 ...ProducerPutSingleFileWithRemotePathTest.java |  8 ++---
 .../DropboxProducerPutWithRemotePathTest.java   |  8 ++---
 .../DropboxProducerSearchQueryTest.java         |  6 ++--
 .../producer/DropboxProducerSearchTest.java     |  4 +--
 20 files changed, 61 insertions(+), 103 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/e4ba8a7b/components/camel-dropbox/src/main/java/org/apache/camel/component/dropbox/DropboxEndpoint.java
----------------------------------------------------------------------
diff --git 
a/components/camel-dropbox/src/main/java/org/apache/camel/component/dropbox/DropboxEndpoint.java
 
b/components/camel-dropbox/src/main/java/org/apache/camel/component/dropbox/DropboxEndpoint.java
index 7250b30..b1c64ba 100755
--- 
a/components/camel-dropbox/src/main/java/org/apache/camel/component/dropbox/DropboxEndpoint.java
+++ 
b/components/camel-dropbox/src/main/java/org/apache/camel/component/dropbox/DropboxEndpoint.java
@@ -27,6 +27,7 @@ import 
org.apache.camel.component.dropbox.integration.producer.DropboxGetProduce
 import 
org.apache.camel.component.dropbox.integration.producer.DropboxMoveProducer;
 import 
org.apache.camel.component.dropbox.integration.producer.DropboxPutProducer;
 import 
org.apache.camel.component.dropbox.integration.producer.DropboxSearchProducer;
+import org.apache.camel.component.dropbox.util.DropboxConstants;
 import org.apache.camel.component.dropbox.util.DropboxException;
 import org.apache.camel.component.dropbox.util.DropboxOperation;
 import org.apache.camel.impl.DefaultEndpoint;
@@ -35,8 +36,6 @@ import org.apache.camel.spi.UriParam;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import static 
org.apache.camel.component.dropbox.util.DropboxConstants.POLL_CONSUMER_DELAY;
-
 /**
  * For uploading, downloading and managing files, folders, groups, 
collaborations, etc on dropbox DOT com.
  */
@@ -95,11 +94,11 @@ public class DropboxEndpoint extends DefaultEndpoint {
         DropboxScheduledPollConsumer consumer;
         if (this.configuration.getOperation() == DropboxOperation.search) {
             consumer = new DropboxScheduledPollSearchConsumer(this, processor, 
configuration);
-            consumer.setDelay(POLL_CONSUMER_DELAY);
+            consumer.setDelay(DropboxConstants.POLL_CONSUMER_DELAY);
             return consumer;
         } else if (this.configuration.getOperation() == DropboxOperation.get) {
             consumer = new DropboxScheduledPollGetConsumer(this, processor, 
configuration);
-            consumer.setDelay(POLL_CONSUMER_DELAY);
+            consumer.setDelay(DropboxConstants.POLL_CONSUMER_DELAY);
             return consumer;
         } else {
             throw new DropboxException("Operation specified is not valid for 
consumer!");

http://git-wip-us.apache.org/repos/asf/camel/blob/e4ba8a7b/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 a979c86..832cac90 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
@@ -19,7 +19,12 @@ package org.apache.camel.component.dropbox.core;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
-import java.util.*;
+import java.util.AbstractMap;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 import com.dropbox.core.DbxClient;
 import com.dropbox.core.DbxEntry;
@@ -31,6 +36,7 @@ import 
org.apache.camel.component.dropbox.dto.DropboxFileDownloadResult;
 import org.apache.camel.component.dropbox.dto.DropboxFileUploadResult;
 import org.apache.camel.component.dropbox.dto.DropboxMoveResult;
 import org.apache.camel.component.dropbox.dto.DropboxSearchResult;
+import org.apache.camel.component.dropbox.util.DropboxConstants;
 import org.apache.camel.component.dropbox.util.DropboxException;
 import org.apache.camel.component.dropbox.util.DropboxResultCode;
 import org.apache.camel.component.dropbox.util.DropboxUploadMode;
@@ -39,10 +45,6 @@ import org.apache.commons.io.FileUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-
-import static 
org.apache.camel.component.dropbox.util.DropboxConstants.DROPBOX_FILE_SEPARATOR;
-
-
 public final class DropboxAPIFacade {
 
     private static final transient Logger LOG = 
LoggerFactory.getLogger(DropboxAPIFacade.class);
@@ -91,7 +93,7 @@ public final class DropboxAPIFacade {
             }
             //in case the entry not exists on dropbox check if the filename 
should be appended
             if (entry == null) {
-                if (dropboxPath.endsWith(DROPBOX_FILE_SEPARATOR)) {
+                if 
(dropboxPath.endsWith(DropboxConstants.DROPBOX_FILE_SEPARATOR)) {
                     dropboxPath = dropboxPath + fileLocalPath.getName();
                 }
             }
@@ -114,8 +116,8 @@ public final class DropboxAPIFacade {
             if (entry != null && !entry.isFolder()) {
                 throw new DropboxException(dropboxPath + " exists on dropbox 
and is not a folder!");
             }
-            if (!dropboxPath.endsWith(DROPBOX_FILE_SEPARATOR)) {
-                dropboxPath = dropboxPath + DROPBOX_FILE_SEPARATOR;
+            if 
(!dropboxPath.endsWith(DropboxConstants.DROPBOX_FILE_SEPARATOR)) {
+                dropboxPath = dropboxPath + 
DropboxConstants.DROPBOX_FILE_SEPARATOR;
             }
             //revert to old path
             String oldDropboxPath = dropboxPath;

http://git-wip-us.apache.org/repos/asf/camel/blob/e4ba8a7b/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 743185e..c5c5ea8 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
@@ -22,10 +22,8 @@ import org.apache.camel.component.dropbox.DropboxEndpoint;
 import org.apache.camel.component.dropbox.core.DropboxAPIFacade;
 import org.apache.camel.component.dropbox.dto.DropboxDelResult;
 import org.apache.camel.component.dropbox.util.DropboxHelper;
-import org.apache.camel.component.dropbox.util.DropboxRequestHeader;
 import org.apache.camel.component.dropbox.util.DropboxResultHeader;
 import 
org.apache.camel.component.dropbox.validator.DropboxConfigurationValidator;
-import org.apache.camel.util.ObjectHelper;
 
 public class DropboxDelProducer extends DropboxProducer {
     

http://git-wip-us.apache.org/repos/asf/camel/blob/e4ba8a7b/components/camel-dropbox/src/main/java/org/apache/camel/component/dropbox/integration/producer/DropboxGetProducer.java
----------------------------------------------------------------------
diff --git 
a/components/camel-dropbox/src/main/java/org/apache/camel/component/dropbox/integration/producer/DropboxGetProducer.java
 
b/components/camel-dropbox/src/main/java/org/apache/camel/component/dropbox/integration/producer/DropboxGetProducer.java
index 2f9a6bd..1836bdf 100755
--- 
a/components/camel-dropbox/src/main/java/org/apache/camel/component/dropbox/integration/producer/DropboxGetProducer.java
+++ 
b/components/camel-dropbox/src/main/java/org/apache/camel/component/dropbox/integration/producer/DropboxGetProducer.java
@@ -24,10 +24,8 @@ import org.apache.camel.component.dropbox.DropboxEndpoint;
 import org.apache.camel.component.dropbox.core.DropboxAPIFacade;
 import org.apache.camel.component.dropbox.dto.DropboxFileDownloadResult;
 import org.apache.camel.component.dropbox.util.DropboxHelper;
-import org.apache.camel.component.dropbox.util.DropboxRequestHeader;
 import org.apache.camel.component.dropbox.util.DropboxResultHeader;
 import 
org.apache.camel.component.dropbox.validator.DropboxConfigurationValidator;
-import org.apache.camel.util.ObjectHelper;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

http://git-wip-us.apache.org/repos/asf/camel/blob/e4ba8a7b/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 b792f92..4f8baf5 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
@@ -22,10 +22,8 @@ import org.apache.camel.component.dropbox.DropboxEndpoint;
 import org.apache.camel.component.dropbox.core.DropboxAPIFacade;
 import org.apache.camel.component.dropbox.dto.DropboxMoveResult;
 import org.apache.camel.component.dropbox.util.DropboxHelper;
-import org.apache.camel.component.dropbox.util.DropboxRequestHeader;
 import org.apache.camel.component.dropbox.util.DropboxResultHeader;
 import 
org.apache.camel.component.dropbox.validator.DropboxConfigurationValidator;
-import org.apache.camel.util.ObjectHelper;
 
 public class DropboxMoveProducer extends DropboxProducer {
 

http://git-wip-us.apache.org/repos/asf/camel/blob/e4ba8a7b/components/camel-dropbox/src/main/java/org/apache/camel/component/dropbox/integration/producer/DropboxPutProducer.java
----------------------------------------------------------------------
diff --git 
a/components/camel-dropbox/src/main/java/org/apache/camel/component/dropbox/integration/producer/DropboxPutProducer.java
 
b/components/camel-dropbox/src/main/java/org/apache/camel/component/dropbox/integration/producer/DropboxPutProducer.java
index b7cf6be..e706e71 100755
--- 
a/components/camel-dropbox/src/main/java/org/apache/camel/component/dropbox/integration/producer/DropboxPutProducer.java
+++ 
b/components/camel-dropbox/src/main/java/org/apache/camel/component/dropbox/integration/producer/DropboxPutProducer.java
@@ -24,12 +24,10 @@ import org.apache.camel.component.dropbox.DropboxEndpoint;
 import org.apache.camel.component.dropbox.core.DropboxAPIFacade;
 import org.apache.camel.component.dropbox.dto.DropboxFileUploadResult;
 import org.apache.camel.component.dropbox.util.DropboxHelper;
-import org.apache.camel.component.dropbox.util.DropboxRequestHeader;
 import org.apache.camel.component.dropbox.util.DropboxResultCode;
 import org.apache.camel.component.dropbox.util.DropboxResultHeader;
 import org.apache.camel.component.dropbox.util.DropboxUploadMode;
 import 
org.apache.camel.component.dropbox.validator.DropboxConfigurationValidator;
-import org.apache.camel.util.ObjectHelper;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

http://git-wip-us.apache.org/repos/asf/camel/blob/e4ba8a7b/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 e296214..7a7734c 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
@@ -23,10 +23,8 @@ import org.apache.camel.component.dropbox.DropboxEndpoint;
 import org.apache.camel.component.dropbox.core.DropboxAPIFacade;
 import org.apache.camel.component.dropbox.dto.DropboxSearchResult;
 import org.apache.camel.component.dropbox.util.DropboxHelper;
-import org.apache.camel.component.dropbox.util.DropboxRequestHeader;
 import org.apache.camel.component.dropbox.util.DropboxResultHeader;
 import 
org.apache.camel.component.dropbox.validator.DropboxConfigurationValidator;
-import org.apache.camel.util.ObjectHelper;
 
 public class DropboxSearchProducer extends DropboxProducer {
 

http://git-wip-us.apache.org/repos/asf/camel/blob/e4ba8a7b/components/camel-dropbox/src/main/java/org/apache/camel/component/dropbox/util/DropboxConstants.java
----------------------------------------------------------------------
diff --git 
a/components/camel-dropbox/src/main/java/org/apache/camel/component/dropbox/util/DropboxConstants.java
 
b/components/camel-dropbox/src/main/java/org/apache/camel/component/dropbox/util/DropboxConstants.java
index 30cdfe4..b713b33 100755
--- 
a/components/camel-dropbox/src/main/java/org/apache/camel/component/dropbox/util/DropboxConstants.java
+++ 
b/components/camel-dropbox/src/main/java/org/apache/camel/component/dropbox/util/DropboxConstants.java
@@ -16,11 +16,14 @@
  */
 package org.apache.camel.component.dropbox.util;
 
-public final class DropboxConstants {
+public interface DropboxConstants {
 
-    public static final String DROPBOX_FILE_SEPARATOR = "/";
-    public static final long POLL_CONSUMER_DELAY = 60 * 60 * 1000L;
-
-    private DropboxConstants() { }
+    String DROPBOX_FILE_SEPARATOR = "/";
+    long POLL_CONSUMER_DELAY = 60 * 60 * 1000L;
 
+    String HEADER_REMOTE_PATH = "CamelDropboxRemotePath";
+    String HEADER_NEW_REMOTE_PATH = "CamelDropboxNewRemotePath";
+    String HEADER_LOCAL_PATH = "CamelDropboxLocalPath";
+    String HEADER_UPLOAD_MODE = "CamelDropboxUploadMode";
+    String HEADER_QUERY = "CamelDropboxQuery";
 }

http://git-wip-us.apache.org/repos/asf/camel/blob/e4ba8a7b/components/camel-dropbox/src/main/java/org/apache/camel/component/dropbox/util/DropboxHelper.java
----------------------------------------------------------------------
diff --git 
a/components/camel-dropbox/src/main/java/org/apache/camel/component/dropbox/util/DropboxHelper.java
 
b/components/camel-dropbox/src/main/java/org/apache/camel/component/dropbox/util/DropboxHelper.java
index 54a8a58..2dbc063 100755
--- 
a/components/camel-dropbox/src/main/java/org/apache/camel/component/dropbox/util/DropboxHelper.java
+++ 
b/components/camel-dropbox/src/main/java/org/apache/camel/component/dropbox/util/DropboxHelper.java
@@ -26,36 +26,36 @@ public final class DropboxHelper {
 
     public static String getRemotePath(DropboxConfiguration configuration, 
Exchange exchange) {
         return ObjectHelper.isNotEmpty(
-            
exchange.getIn().getHeader(DropboxRequestHeader.REMOTE_PATH.name()))
-            ? 
exchange.getIn().getHeader(DropboxRequestHeader.REMOTE_PATH.name(), 
String.class).replaceAll("\\s", "+")
+            exchange.getIn().getHeader(DropboxConstants.HEADER_REMOTE_PATH))
+            ? exchange.getIn().getHeader(DropboxConstants.HEADER_REMOTE_PATH, 
String.class).replaceAll("\\s", "+")
             : configuration.getRemotePath();
     }
 
     public static String getNewRemotePath(DropboxConfiguration configuration, 
Exchange exchange) {
         return ObjectHelper.isNotEmpty(
-            
exchange.getIn().getHeader(DropboxRequestHeader.NEW_REMOTE_PATH.name()))
-            ? 
exchange.getIn().getHeader(DropboxRequestHeader.NEW_REMOTE_PATH.name(), 
String.class)
+            
exchange.getIn().getHeader(DropboxConstants.HEADER_NEW_REMOTE_PATH))
+            ? 
exchange.getIn().getHeader(DropboxConstants.HEADER_NEW_REMOTE_PATH, 
String.class)
             : configuration.getNewRemotePath();
     }
 
     public static String getLocalPath(DropboxConfiguration configuration, 
Exchange exchange) {
         return ObjectHelper.isNotEmpty(
-            exchange.getIn().getHeader(DropboxRequestHeader.LOCAL_PATH.name()))
-            ? 
exchange.getIn().getHeader(DropboxRequestHeader.LOCAL_PATH.name(), String.class)
+            exchange.getIn().getHeader(DropboxConstants.HEADER_LOCAL_PATH))
+            ? exchange.getIn().getHeader(DropboxConstants.HEADER_LOCAL_PATH, 
String.class)
             : configuration.getLocalPath();
     }
 
     public static String getQuery(DropboxConfiguration configuration, Exchange 
exchange) {
         return ObjectHelper.isNotEmpty(
-            exchange.getIn().getHeader(DropboxRequestHeader.QUERY.name()))
-            ? exchange.getIn().getHeader(DropboxRequestHeader.QUERY.name(), 
String.class)
+            exchange.getIn().getHeader(DropboxConstants.HEADER_QUERY))
+            ? exchange.getIn().getHeader(DropboxConstants.HEADER_QUERY, 
String.class)
             : configuration.getQuery();
     }
 
     public static DropboxUploadMode getUploadMode(DropboxConfiguration 
configuration, Exchange exchange) {
         return ObjectHelper.isNotEmpty(
-            
exchange.getIn().getHeader(DropboxRequestHeader.UPLOAD_MODE.name()))
-            ? 
DropboxUploadMode.valueOf(exchange.getIn().getHeader(DropboxRequestHeader.UPLOAD_MODE.name(),
 String.class))
+            exchange.getIn().getHeader(DropboxConstants.HEADER_UPLOAD_MODE))
+            ? 
DropboxUploadMode.valueOf(exchange.getIn().getHeader(DropboxConstants.HEADER_UPLOAD_MODE,
 String.class))
             : configuration.getUploadMode();
     }
 

http://git-wip-us.apache.org/repos/asf/camel/blob/e4ba8a7b/components/camel-dropbox/src/main/java/org/apache/camel/component/dropbox/util/DropboxRequestHeader.java
----------------------------------------------------------------------
diff --git 
a/components/camel-dropbox/src/main/java/org/apache/camel/component/dropbox/util/DropboxRequestHeader.java
 
b/components/camel-dropbox/src/main/java/org/apache/camel/component/dropbox/util/DropboxRequestHeader.java
deleted file mode 100644
index 572025e..0000000
--- 
a/components/camel-dropbox/src/main/java/org/apache/camel/component/dropbox/util/DropboxRequestHeader.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.component.dropbox.util;
-
-public enum DropboxRequestHeader {
-    REMOTE_PATH("remotePath"),
-    NEW_REMOTE_PATH("newRemotePath"),
-    LOCAL_PATH("localPath"),
-    UPLOAD_MODE("uploadMode"),
-    QUERY("query");
-
-    private String name;
-
-    DropboxRequestHeader(String name) {
-        this.name = name;
-    }
-
-    public String toString() {
-        return name;
-    }
-}

http://git-wip-us.apache.org/repos/asf/camel/blob/e4ba8a7b/components/camel-dropbox/src/main/java/org/apache/camel/component/dropbox/validator/DropboxConfigurationValidator.java
----------------------------------------------------------------------
diff --git 
a/components/camel-dropbox/src/main/java/org/apache/camel/component/dropbox/validator/DropboxConfigurationValidator.java
 
b/components/camel-dropbox/src/main/java/org/apache/camel/component/dropbox/validator/DropboxConfigurationValidator.java
index 592b462..4c1e0b4 100755
--- 
a/components/camel-dropbox/src/main/java/org/apache/camel/component/dropbox/validator/DropboxConfigurationValidator.java
+++ 
b/components/camel-dropbox/src/main/java/org/apache/camel/component/dropbox/validator/DropboxConfigurationValidator.java
@@ -21,11 +21,10 @@ import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
 import org.apache.camel.component.dropbox.DropboxConfiguration;
+import org.apache.camel.component.dropbox.util.DropboxConstants;
 import org.apache.camel.component.dropbox.util.DropboxException;
 import org.apache.camel.component.dropbox.util.DropboxUploadMode;
 
-import static 
org.apache.camel.component.dropbox.util.DropboxConstants.DROPBOX_FILE_SEPARATOR;
-
 public final class DropboxConfigurationValidator {
 
     private static final Pattern PATTERN = Pattern.compile("/*?(\\S+)/*?", 
Pattern.CASE_INSENSITIVE);
@@ -84,14 +83,14 @@ public final class DropboxConfigurationValidator {
 
     private static void validateRemotePath(String remotePath) throws 
DropboxException {
 
-        if (remotePath == null || 
!remotePath.startsWith(DROPBOX_FILE_SEPARATOR)) {
+        if (remotePath == null || 
!remotePath.startsWith(DropboxConstants.DROPBOX_FILE_SEPARATOR)) {
             throw new DropboxException("option <remotePath> is not valid!");
         }
         validatePathInUnix(remotePath);
     }
 
     private static void validateRemotePathForPut(String remotePath) throws 
DropboxException {
-        if (!remotePath.startsWith(DROPBOX_FILE_SEPARATOR)) {
+        if (!remotePath.startsWith(DropboxConstants.DROPBOX_FILE_SEPARATOR)) {
             throw new DropboxException("option <remotePath> is not valid!");
         }
         validatePathInUnix(remotePath);

http://git-wip-us.apache.org/repos/asf/camel/blob/e4ba8a7b/components/camel-dropbox/src/test/java/org/apache/camel/component/dropbox/integration/producer/DropboxProducerDelTest.java
----------------------------------------------------------------------
diff --git 
a/components/camel-dropbox/src/test/java/org/apache/camel/component/dropbox/integration/producer/DropboxProducerDelTest.java
 
b/components/camel-dropbox/src/test/java/org/apache/camel/component/dropbox/integration/producer/DropboxProducerDelTest.java
index c4682b4..b91307e 100755
--- 
a/components/camel-dropbox/src/test/java/org/apache/camel/component/dropbox/integration/producer/DropboxProducerDelTest.java
+++ 
b/components/camel-dropbox/src/test/java/org/apache/camel/component/dropbox/integration/producer/DropboxProducerDelTest.java
@@ -22,7 +22,7 @@ import org.apache.camel.Exchange;
 import org.apache.camel.Processor;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.dropbox.integration.DropboxTestSupport;
-import org.apache.camel.component.dropbox.util.DropboxRequestHeader;
+import org.apache.camel.component.dropbox.util.DropboxConstants;
 import org.apache.camel.component.dropbox.util.DropboxResultHeader;
 import org.apache.camel.component.mock.MockEndpoint;
 import org.junit.Test;
@@ -84,7 +84,7 @@ public class DropboxProducerDelTest extends 
DropboxTestSupport {
                         .to("mock:result");
 
                 from("direct:start2")
-                    .setHeader(DropboxRequestHeader.REMOTE_PATH.name(), 
constant("/XXX"))
+                    .setHeader(DropboxConstants.HEADER_REMOTE_PATH, 
constant("/XXX"))
                     
.to("dropbox://del?accessToken={{accessToken}}&clientIdentifier={{clientIdentifier}}")
                     .to("mock:result");
             }

http://git-wip-us.apache.org/repos/asf/camel/blob/e4ba8a7b/components/camel-dropbox/src/test/java/org/apache/camel/component/dropbox/integration/producer/DropboxProducerGetFolderTest.java
----------------------------------------------------------------------
diff --git 
a/components/camel-dropbox/src/test/java/org/apache/camel/component/dropbox/integration/producer/DropboxProducerGetFolderTest.java
 
b/components/camel-dropbox/src/test/java/org/apache/camel/component/dropbox/integration/producer/DropboxProducerGetFolderTest.java
index c4e2c24..1eb3779 100755
--- 
a/components/camel-dropbox/src/test/java/org/apache/camel/component/dropbox/integration/producer/DropboxProducerGetFolderTest.java
+++ 
b/components/camel-dropbox/src/test/java/org/apache/camel/component/dropbox/integration/producer/DropboxProducerGetFolderTest.java
@@ -22,7 +22,7 @@ import org.apache.camel.Exchange;
 import org.apache.camel.Processor;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.dropbox.integration.DropboxTestSupport;
-import org.apache.camel.component.dropbox.util.DropboxRequestHeader;
+import org.apache.camel.component.dropbox.util.DropboxConstants;
 import org.apache.camel.component.dropbox.util.DropboxResultHeader;
 import org.apache.camel.component.mock.MockEndpoint;
 import org.junit.Test;
@@ -66,7 +66,7 @@ public class DropboxProducerGetFolderTest extends 
DropboxTestSupport {
             @Override
             public void process(Exchange exchange) throws Exception {
                 exchange.getIn().setHeader("test", "test");
-                
exchange.getIn().setHeader(DropboxRequestHeader.REMOTE_PATH.name(), "/XXX");
+                
exchange.getIn().setHeader(DropboxConstants.HEADER_REMOTE_PATH, "/XXX");
             }
         });
 
@@ -120,7 +120,7 @@ public class DropboxProducerGetFolderTest extends 
DropboxTestSupport {
                         .to("mock:result");
 
                 from("direct:start2")
-                    .setHeader(DropboxRequestHeader.REMOTE_PATH.name(), 
constant("/XXX"))
+                    .setHeader(DropboxConstants.HEADER_REMOTE_PATH, 
constant("/XXX"))
                     
.to("dropbox://get?accessToken={{accessToken}}&clientIdentifier={{clientIdentifier}}")
                     .to("mock:result");
 
@@ -129,7 +129,7 @@ public class DropboxProducerGetFolderTest extends 
DropboxTestSupport {
                     .to("mock:result");
 
                 from("direct:start4")
-                    .setHeader(DropboxRequestHeader.REMOTE_PATH.name(), 
constant("/XXX"))
+                    .setHeader(DropboxConstants.HEADER_REMOTE_PATH, 
constant("/XXX"))
                     
.to("dropbox://get?accessToken={{accessToken}}&clientIdentifier={{clientIdentifier}}&remotePath=/aWrongPath")
                     .to("mock:result");
 

http://git-wip-us.apache.org/repos/asf/camel/blob/e4ba8a7b/components/camel-dropbox/src/test/java/org/apache/camel/component/dropbox/integration/producer/DropboxProducerGetSingleTest.java
----------------------------------------------------------------------
diff --git 
a/components/camel-dropbox/src/test/java/org/apache/camel/component/dropbox/integration/producer/DropboxProducerGetSingleTest.java
 
b/components/camel-dropbox/src/test/java/org/apache/camel/component/dropbox/integration/producer/DropboxProducerGetSingleTest.java
index f61dfef..30563b3 100755
--- 
a/components/camel-dropbox/src/test/java/org/apache/camel/component/dropbox/integration/producer/DropboxProducerGetSingleTest.java
+++ 
b/components/camel-dropbox/src/test/java/org/apache/camel/component/dropbox/integration/producer/DropboxProducerGetSingleTest.java
@@ -22,7 +22,7 @@ import org.apache.camel.Exchange;
 import org.apache.camel.Processor;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.dropbox.integration.DropboxTestSupport;
-import org.apache.camel.component.dropbox.util.DropboxRequestHeader;
+import org.apache.camel.component.dropbox.util.DropboxConstants;
 import org.apache.camel.component.dropbox.util.DropboxResultHeader;
 import org.apache.camel.component.mock.MockEndpoint;
 import org.junit.Test;
@@ -85,7 +85,7 @@ public class DropboxProducerGetSingleTest extends 
DropboxTestSupport {
                         .to("mock:result");
 
                 from("direct:start2")
-                    .setHeader(DropboxRequestHeader.REMOTE_PATH.name(), 
constant("/XXX"))
+                    .setHeader(DropboxConstants.HEADER_REMOTE_PATH, 
constant("/XXX"))
                     
.to("dropbox://get?accessToken={{accessToken}}&clientIdentifier={{clientIdentifier}}")
                     .to("file:///XXX?fileName=XXX")
                     .to("mock:result");

http://git-wip-us.apache.org/repos/asf/camel/blob/e4ba8a7b/components/camel-dropbox/src/test/java/org/apache/camel/component/dropbox/integration/producer/DropboxProducerMoveTest.java
----------------------------------------------------------------------
diff --git 
a/components/camel-dropbox/src/test/java/org/apache/camel/component/dropbox/integration/producer/DropboxProducerMoveTest.java
 
b/components/camel-dropbox/src/test/java/org/apache/camel/component/dropbox/integration/producer/DropboxProducerMoveTest.java
index 57f8c9f..b5005e7 100755
--- 
a/components/camel-dropbox/src/test/java/org/apache/camel/component/dropbox/integration/producer/DropboxProducerMoveTest.java
+++ 
b/components/camel-dropbox/src/test/java/org/apache/camel/component/dropbox/integration/producer/DropboxProducerMoveTest.java
@@ -22,7 +22,7 @@ import org.apache.camel.Exchange;
 import org.apache.camel.Processor;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.dropbox.integration.DropboxTestSupport;
-import org.apache.camel.component.dropbox.util.DropboxRequestHeader;
+import org.apache.camel.component.dropbox.util.DropboxConstants;
 import org.apache.camel.component.dropbox.util.DropboxResultHeader;
 import org.apache.camel.component.mock.MockEndpoint;
 import org.junit.Test;
@@ -84,8 +84,8 @@ public class DropboxProducerMoveTest extends 
DropboxTestSupport {
                         .to("mock:result");
 
                 from("direct:start2")
-                    .setHeader(DropboxRequestHeader.REMOTE_PATH.name(), 
constant("/XXX"))
-                    .setHeader(DropboxRequestHeader.NEW_REMOTE_PATH.name(), 
constant("/XXX"))
+                    .setHeader(DropboxConstants.HEADER_REMOTE_PATH, 
constant("/XXX"))
+                    .setHeader(DropboxConstants.HEADER_NEW_REMOTE_PATH, 
constant("/XXX"))
                     
.to("dropbox://move?accessToken={{accessToken}}&clientIdentifier={{clientIdentifier}}")
                     .to("mock:result");
             }

http://git-wip-us.apache.org/repos/asf/camel/blob/e4ba8a7b/components/camel-dropbox/src/test/java/org/apache/camel/component/dropbox/integration/producer/DropboxProducerPutSingleFileTest.java
----------------------------------------------------------------------
diff --git 
a/components/camel-dropbox/src/test/java/org/apache/camel/component/dropbox/integration/producer/DropboxProducerPutSingleFileTest.java
 
b/components/camel-dropbox/src/test/java/org/apache/camel/component/dropbox/integration/producer/DropboxProducerPutSingleFileTest.java
index 9cf0098..c51f7f5 100755
--- 
a/components/camel-dropbox/src/test/java/org/apache/camel/component/dropbox/integration/producer/DropboxProducerPutSingleFileTest.java
+++ 
b/components/camel-dropbox/src/test/java/org/apache/camel/component/dropbox/integration/producer/DropboxProducerPutSingleFileTest.java
@@ -22,7 +22,7 @@ import org.apache.camel.Exchange;
 import org.apache.camel.Processor;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.dropbox.integration.DropboxTestSupport;
-import org.apache.camel.component.dropbox.util.DropboxRequestHeader;
+import org.apache.camel.component.dropbox.util.DropboxConstants;
 import org.apache.camel.component.dropbox.util.DropboxResultHeader;
 import org.apache.camel.component.dropbox.util.DropboxUploadMode;
 import org.apache.camel.component.mock.MockEndpoint;
@@ -85,8 +85,8 @@ public class DropboxProducerPutSingleFileTest extends 
DropboxTestSupport {
                         .to("mock:result");
 
                 from("direct:start2")
-                    .setHeader(DropboxRequestHeader.LOCAL_PATH.name(), 
constant("/XXX"))
-                    .setHeader(DropboxRequestHeader.UPLOAD_MODE.name(), 
constant(DropboxUploadMode.add))
+                    .setHeader(DropboxConstants.HEADER_LOCAL_PATH, 
constant("/XXX"))
+                    .setHeader(DropboxConstants.HEADER_UPLOAD_MODE, 
constant(DropboxUploadMode.add))
                     
.to("dropbox://put?accessToken={{accessToken}}&clientIdentifier={{clientIdentifier}}")
                     .to("mock:result");
             }

http://git-wip-us.apache.org/repos/asf/camel/blob/e4ba8a7b/components/camel-dropbox/src/test/java/org/apache/camel/component/dropbox/integration/producer/DropboxProducerPutSingleFileWithRemotePathTest.java
----------------------------------------------------------------------
diff --git 
a/components/camel-dropbox/src/test/java/org/apache/camel/component/dropbox/integration/producer/DropboxProducerPutSingleFileWithRemotePathTest.java
 
b/components/camel-dropbox/src/test/java/org/apache/camel/component/dropbox/integration/producer/DropboxProducerPutSingleFileWithRemotePathTest.java
index e60e933..8b1c7e0 100755
--- 
a/components/camel-dropbox/src/test/java/org/apache/camel/component/dropbox/integration/producer/DropboxProducerPutSingleFileWithRemotePathTest.java
+++ 
b/components/camel-dropbox/src/test/java/org/apache/camel/component/dropbox/integration/producer/DropboxProducerPutSingleFileWithRemotePathTest.java
@@ -22,7 +22,7 @@ import org.apache.camel.Exchange;
 import org.apache.camel.Processor;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.dropbox.integration.DropboxTestSupport;
-import org.apache.camel.component.dropbox.util.DropboxRequestHeader;
+import org.apache.camel.component.dropbox.util.DropboxConstants;
 import org.apache.camel.component.dropbox.util.DropboxResultHeader;
 import org.apache.camel.component.dropbox.util.DropboxUploadMode;
 import org.apache.camel.component.mock.MockEndpoint;
@@ -85,9 +85,9 @@ public class DropboxProducerPutSingleFileWithRemotePathTest 
extends DropboxTestS
                         .to("mock:result");
 
                 from("direct:start2")
-                    .setHeader(DropboxRequestHeader.UPLOAD_MODE.name(), 
constant(DropboxUploadMode.add))
-                    .setHeader(DropboxRequestHeader.LOCAL_PATH.name(), 
constant("/tmp/toto.txt"))
-                    .setHeader(DropboxRequestHeader.REMOTE_PATH.name(), 
constant("/test"))
+                    .setHeader(DropboxConstants.HEADER_UPLOAD_MODE, 
constant(DropboxUploadMode.add))
+                    .setHeader(DropboxConstants.HEADER_LOCAL_PATH, 
constant("/tmp/toto.txt"))
+                    .setHeader(DropboxConstants.HEADER_REMOTE_PATH, 
constant("/test"))
                     
.to("dropbox://put?accessToken={{accessToken}}&clientIdentifier={{clientIdentifier}}")
                     .to("mock:result");
             }

http://git-wip-us.apache.org/repos/asf/camel/blob/e4ba8a7b/components/camel-dropbox/src/test/java/org/apache/camel/component/dropbox/integration/producer/DropboxProducerPutWithRemotePathTest.java
----------------------------------------------------------------------
diff --git 
a/components/camel-dropbox/src/test/java/org/apache/camel/component/dropbox/integration/producer/DropboxProducerPutWithRemotePathTest.java
 
b/components/camel-dropbox/src/test/java/org/apache/camel/component/dropbox/integration/producer/DropboxProducerPutWithRemotePathTest.java
index 261e9d0..433d084 100755
--- 
a/components/camel-dropbox/src/test/java/org/apache/camel/component/dropbox/integration/producer/DropboxProducerPutWithRemotePathTest.java
+++ 
b/components/camel-dropbox/src/test/java/org/apache/camel/component/dropbox/integration/producer/DropboxProducerPutWithRemotePathTest.java
@@ -22,7 +22,7 @@ import org.apache.camel.Exchange;
 import org.apache.camel.Processor;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.dropbox.integration.DropboxTestSupport;
-import org.apache.camel.component.dropbox.util.DropboxRequestHeader;
+import org.apache.camel.component.dropbox.util.DropboxConstants;
 import org.apache.camel.component.dropbox.util.DropboxResultHeader;
 import org.apache.camel.component.dropbox.util.DropboxUploadMode;
 import org.apache.camel.component.mock.MockEndpoint;
@@ -84,9 +84,9 @@ public class DropboxProducerPutWithRemotePathTest extends 
DropboxTestSupport {
                         .to("mock:result");
 
                 from("direct:start2")
-                    .setHeader(DropboxRequestHeader.LOCAL_PATH.name(), 
constant("/XXX"))
-                    .setHeader(DropboxRequestHeader.REMOTE_PATH.name(), 
constant("/XXX"))
-                    .setHeader(DropboxRequestHeader.UPLOAD_MODE.name(), 
constant(DropboxUploadMode.add))
+                    .setHeader(DropboxConstants.HEADER_LOCAL_PATH, 
constant("/XXX"))
+                    .setHeader(DropboxConstants.HEADER_REMOTE_PATH, 
constant("/XXX"))
+                    .setHeader(DropboxConstants.HEADER_UPLOAD_MODE, 
constant(DropboxUploadMode.add))
                     
.to("dropbox://put?accessToken={{accessToken}}&clientIdentifier={{clientIdentifier}}")
                     .to("mock:result");
             }

http://git-wip-us.apache.org/repos/asf/camel/blob/e4ba8a7b/components/camel-dropbox/src/test/java/org/apache/camel/component/dropbox/integration/producer/DropboxProducerSearchQueryTest.java
----------------------------------------------------------------------
diff --git 
a/components/camel-dropbox/src/test/java/org/apache/camel/component/dropbox/integration/producer/DropboxProducerSearchQueryTest.java
 
b/components/camel-dropbox/src/test/java/org/apache/camel/component/dropbox/integration/producer/DropboxProducerSearchQueryTest.java
index 03e9ebb..04a1d64 100755
--- 
a/components/camel-dropbox/src/test/java/org/apache/camel/component/dropbox/integration/producer/DropboxProducerSearchQueryTest.java
+++ 
b/components/camel-dropbox/src/test/java/org/apache/camel/component/dropbox/integration/producer/DropboxProducerSearchQueryTest.java
@@ -22,7 +22,7 @@ import org.apache.camel.Exchange;
 import org.apache.camel.Processor;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.dropbox.integration.DropboxTestSupport;
-import org.apache.camel.component.dropbox.util.DropboxRequestHeader;
+import org.apache.camel.component.dropbox.util.DropboxConstants;
 import org.apache.camel.component.dropbox.util.DropboxResultHeader;
 import org.apache.camel.component.mock.MockEndpoint;
 import org.junit.Test;
@@ -87,8 +87,8 @@ public class DropboxProducerSearchQueryTest extends 
DropboxTestSupport {
                         .to("mock:result");
 
                 from("direct:start2")
-                    .setHeader(DropboxRequestHeader.REMOTE_PATH.name(), 
constant("/XXX"))
-                    .setHeader(DropboxRequestHeader.QUERY.name(), 
constant("/XXX"))
+                    .setHeader(DropboxConstants.HEADER_REMOTE_PATH, 
constant("/XXX"))
+                    .setHeader(DropboxConstants.HEADER_QUERY, constant("/XXX"))
                     
.to("dropbox://search?accessToken={{accessToken}}&clientIdentifier={{clientIdentifier}}")
                     .to("mock:result");
             }

http://git-wip-us.apache.org/repos/asf/camel/blob/e4ba8a7b/components/camel-dropbox/src/test/java/org/apache/camel/component/dropbox/integration/producer/DropboxProducerSearchTest.java
----------------------------------------------------------------------
diff --git 
a/components/camel-dropbox/src/test/java/org/apache/camel/component/dropbox/integration/producer/DropboxProducerSearchTest.java
 
b/components/camel-dropbox/src/test/java/org/apache/camel/component/dropbox/integration/producer/DropboxProducerSearchTest.java
index 277c267..83ac334 100755
--- 
a/components/camel-dropbox/src/test/java/org/apache/camel/component/dropbox/integration/producer/DropboxProducerSearchTest.java
+++ 
b/components/camel-dropbox/src/test/java/org/apache/camel/component/dropbox/integration/producer/DropboxProducerSearchTest.java
@@ -22,7 +22,7 @@ import org.apache.camel.Exchange;
 import org.apache.camel.Processor;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.dropbox.integration.DropboxTestSupport;
-import org.apache.camel.component.dropbox.util.DropboxRequestHeader;
+import org.apache.camel.component.dropbox.util.DropboxConstants;
 import org.apache.camel.component.dropbox.util.DropboxResultHeader;
 import org.apache.camel.component.mock.MockEndpoint;
 import org.junit.Test;
@@ -83,7 +83,7 @@ public class DropboxProducerSearchTest extends 
DropboxTestSupport {
                         .to("mock:result");
 
                 from("direct:start")
-                    .setHeader(DropboxRequestHeader.REMOTE_PATH.name(), 
constant("/XXX"))
+                    .setHeader(DropboxConstants.HEADER_REMOTE_PATH, 
constant("/XXX"))
                     
.to("dropbox://search?accessToken={{accessToken}}&clientIdentifier={{clientIdentifier}}")
                     .to("mock:result");
             }

Reply via email to