You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2017/10/07 09:12:22 UTC
[1/2] camel git commit: CAMEL-11678 - clientIdentifer is not
mandatory if accessToken exists
Repository: camel
Updated Branches:
refs/heads/master 751934bd6 -> f4e3ec1ac
CAMEL-11678 - clientIdentifer is not mandatory if accessToken exists
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/2c1c1b6c
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/2c1c1b6c
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/2c1c1b6c
Branch: refs/heads/master
Commit: 2c1c1b6c0366c010c135cae2a1b60619ac6c2754
Parents: 751934b
Author: onders86 <on...@gmail.com>
Authored: Thu Oct 5 10:03:00 2017 +0300
Committer: Claus Ibsen <da...@apache.org>
Committed: Sat Oct 7 11:07:53 2017 +0200
----------------------------------------------------------------------
.../camel-dropbox/src/main/docs/dropbox-component.adoc | 2 +-
.../apache/camel/component/dropbox/DropboxConfiguration.java | 2 +-
.../apache/camel/component/dropbox/DropboxConsumerTest.java | 8 ++++----
.../integration/consumer/DropboxConsumerGetSingleTest.java | 2 +-
.../integration/consumer/DropboxConsumerSearchQueryTest.java | 2 +-
.../integration/consumer/DropboxConsumerSearchTest.java | 2 +-
.../dropbox/integration/producer/DropboxProducerDelTest.java | 4 ++--
.../integration/producer/DropboxProducerGetFolderTest.java | 8 ++++----
.../integration/producer/DropboxProducerGetSingleTest.java | 4 ++--
.../integration/producer/DropboxProducerMoveTest.java | 4 ++--
.../producer/DropboxProducerPutSingleFileTest.java | 4 ++--
.../DropboxProducerPutSingleFileWithRemotePathTest.java | 4 ++--
.../producer/DropboxProducerPutWithRemotePathTest.java | 4 ++--
.../integration/producer/DropboxProducerSearchQueryTest.java | 4 ++--
.../integration/producer/DropboxProducerSearchTest.java | 4 ++--
15 files changed, 29 insertions(+), 29 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/2c1c1b6c/components/camel-dropbox/src/main/docs/dropbox-component.adoc
----------------------------------------------------------------------
diff --git a/components/camel-dropbox/src/main/docs/dropbox-component.adoc b/components/camel-dropbox/src/main/docs/dropbox-component.adoc
index a40e727..0e8db8a 100644
--- a/components/camel-dropbox/src/main/docs/dropbox-component.adoc
+++ b/components/camel-dropbox/src/main/docs/dropbox-component.adoc
@@ -92,7 +92,7 @@ with the following path and query parameters:
| Name | Description | Default | Type
| *accessToken* (common) | *Required* The access token to make API requests for a specific Dropbox user | | String
| *client* (common) | To use an existing DbxClient instance as DropBox client. | | DbxClientV2
-| *clientIdentifier* (common) | *Required* Name of the app registered to make API requests | | String
+| *clientIdentifier* (common) | Name of the app registered to make API requests | | String
| *localPath* (common) | Optional folder or file to upload on Dropbox from the local filesystem. If this option has not been configured then the message body is used as the content to upload. | | String
| *newRemotePath* (common) | Destination file or folder | | String
| *query* (common) | A space-separated list of sub-strings to search for. A file matches only if it contains all the sub-strings. If this option is not set all files will be matched. | | String
http://git-wip-us.apache.org/repos/asf/camel/blob/2c1c1b6c/components/camel-dropbox/src/main/java/org/apache/camel/component/dropbox/DropboxConfiguration.java
----------------------------------------------------------------------
diff --git a/components/camel-dropbox/src/main/java/org/apache/camel/component/dropbox/DropboxConfiguration.java b/components/camel-dropbox/src/main/java/org/apache/camel/component/dropbox/DropboxConfiguration.java
index 3263fdc..e99ed02 100755
--- a/components/camel-dropbox/src/main/java/org/apache/camel/component/dropbox/DropboxConfiguration.java
+++ b/components/camel-dropbox/src/main/java/org/apache/camel/component/dropbox/DropboxConfiguration.java
@@ -52,7 +52,7 @@ public class DropboxConfiguration {
@UriParam
private DropboxUploadMode uploadMode;
//id of the app
- @UriParam @Metadata(required = "true")
+ @UriParam
private String clientIdentifier;
//reference to dropbox client
@UriParam
http://git-wip-us.apache.org/repos/asf/camel/blob/2c1c1b6c/components/camel-dropbox/src/test/java/org/apache/camel/component/dropbox/DropboxConsumerTest.java
----------------------------------------------------------------------
diff --git a/components/camel-dropbox/src/test/java/org/apache/camel/component/dropbox/DropboxConsumerTest.java b/components/camel-dropbox/src/test/java/org/apache/camel/component/dropbox/DropboxConsumerTest.java
index 646a6ea..199d5da 100644
--- a/components/camel-dropbox/src/test/java/org/apache/camel/component/dropbox/DropboxConsumerTest.java
+++ b/components/camel-dropbox/src/test/java/org/apache/camel/component/dropbox/DropboxConsumerTest.java
@@ -34,9 +34,9 @@ public class DropboxConsumerTest extends DropboxTestSupport {
return new RouteBuilder() {
@Override
public void configure() throws Exception {
- from("dropbox://get?accessToken={{accessToken}}&clientIdentifier={{clientIdentifier}}&remotePath=/path").to("mock:test1");
+ from("dropbox://get?accessToken={{accessToken}}&remotePath=/path").to("mock:test1");
- from("dropbox://get?accessToken={{accessToken}}&clientIdentifier={{clientIdentifier}}&remotePath=/path with spaces/file").to("mock:test2");
+ from("dropbox://get?accessToken={{accessToken}}&remotePath=/path with spaces/file").to("mock:test2");
}
};
}
@@ -44,7 +44,7 @@ public class DropboxConsumerTest extends DropboxTestSupport {
@Test
public void shouldCreateGetConsumer() throws Exception {
// Given
- Endpoint dropboxEndpoint1 = context.getEndpoint("dropbox://get?accessToken={{accessToken}}&clientIdentifier={{clientIdentifier}}&remotePath=/path");
+ Endpoint dropboxEndpoint1 = context.getEndpoint("dropbox://get?accessToken={{accessToken}}&remotePath=/path");
// When
Consumer consumer1 = dropboxEndpoint1.createConsumer(null);
@@ -53,7 +53,7 @@ public class DropboxConsumerTest extends DropboxTestSupport {
Assert.assertTrue(consumer1 instanceof DropboxScheduledPollGetConsumer);
// Given
- Endpoint dropboxEndpoint2 = context.getEndpoint("dropbox://get?accessToken={{accessToken}}&clientIdentifier={{clientIdentifier}}&remotePath=/path with spaces/file");
+ Endpoint dropboxEndpoint2 = context.getEndpoint("dropbox://get?accessToken={{accessToken}}&remotePath=/path with spaces/file");
// When
Consumer consumer2 = dropboxEndpoint2.createConsumer(null);
http://git-wip-us.apache.org/repos/asf/camel/blob/2c1c1b6c/components/camel-dropbox/src/test/java/org/apache/camel/component/dropbox/integration/consumer/DropboxConsumerGetSingleTest.java
----------------------------------------------------------------------
diff --git a/components/camel-dropbox/src/test/java/org/apache/camel/component/dropbox/integration/consumer/DropboxConsumerGetSingleTest.java b/components/camel-dropbox/src/test/java/org/apache/camel/component/dropbox/integration/consumer/DropboxConsumerGetSingleTest.java
index 8ffa064..b9b340c 100755
--- a/components/camel-dropbox/src/test/java/org/apache/camel/component/dropbox/integration/consumer/DropboxConsumerGetSingleTest.java
+++ b/components/camel-dropbox/src/test/java/org/apache/camel/component/dropbox/integration/consumer/DropboxConsumerGetSingleTest.java
@@ -48,7 +48,7 @@ public class DropboxConsumerGetSingleTest extends DropboxTestSupport {
protected RouteBuilder createRouteBuilder() throws Exception {
return new RouteBuilder() {
public void configure() {
- from("dropbox://get?accessToken={{accessToken}}&clientIdentifier={{clientIdentifier}}&remotePath=XXX")
+ from("dropbox://get?accessToken={{accessToken}}&remotePath=XXX")
.to("file:XXX")
.to("mock:result");
}
http://git-wip-us.apache.org/repos/asf/camel/blob/2c1c1b6c/components/camel-dropbox/src/test/java/org/apache/camel/component/dropbox/integration/consumer/DropboxConsumerSearchQueryTest.java
----------------------------------------------------------------------
diff --git a/components/camel-dropbox/src/test/java/org/apache/camel/component/dropbox/integration/consumer/DropboxConsumerSearchQueryTest.java b/components/camel-dropbox/src/test/java/org/apache/camel/component/dropbox/integration/consumer/DropboxConsumerSearchQueryTest.java
index 46b0be0..253efd1 100755
--- a/components/camel-dropbox/src/test/java/org/apache/camel/component/dropbox/integration/consumer/DropboxConsumerSearchQueryTest.java
+++ b/components/camel-dropbox/src/test/java/org/apache/camel/component/dropbox/integration/consumer/DropboxConsumerSearchQueryTest.java
@@ -48,7 +48,7 @@ public class DropboxConsumerSearchQueryTest extends DropboxTestSupport {
protected RouteBuilder createRouteBuilder() throws Exception {
return new RouteBuilder() {
public void configure() {
- from("dropbox://search?accessToken={{accessToken}}&clientIdentifier={{clientIdentifier}}&remotePath=/XXX&query=XXX")
+ from("dropbox://search?accessToken={{accessToken}}&remotePath=/XXX&query=XXX")
.to("mock:result");
}
};
http://git-wip-us.apache.org/repos/asf/camel/blob/2c1c1b6c/components/camel-dropbox/src/test/java/org/apache/camel/component/dropbox/integration/consumer/DropboxConsumerSearchTest.java
----------------------------------------------------------------------
diff --git a/components/camel-dropbox/src/test/java/org/apache/camel/component/dropbox/integration/consumer/DropboxConsumerSearchTest.java b/components/camel-dropbox/src/test/java/org/apache/camel/component/dropbox/integration/consumer/DropboxConsumerSearchTest.java
index 242c210..b6f3273 100755
--- a/components/camel-dropbox/src/test/java/org/apache/camel/component/dropbox/integration/consumer/DropboxConsumerSearchTest.java
+++ b/components/camel-dropbox/src/test/java/org/apache/camel/component/dropbox/integration/consumer/DropboxConsumerSearchTest.java
@@ -48,7 +48,7 @@ public class DropboxConsumerSearchTest extends DropboxTestSupport {
protected RouteBuilder createRouteBuilder() throws Exception {
return new RouteBuilder() {
public void configure() {
- from("dropbox://search?accessToken={{accessToken}}&clientIdentifier={{clientIdentifier}}&remotePath=/XXX")
+ from("dropbox://search?accessToken={{accessToken}}&remotePath=/XXX")
.to("mock:result");
}
};
http://git-wip-us.apache.org/repos/asf/camel/blob/2c1c1b6c/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 b91307e..766a22c 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
@@ -80,12 +80,12 @@ public class DropboxProducerDelTest extends DropboxTestSupport {
return new RouteBuilder() {
public void configure() {
from("direct:start")
- .to("dropbox://del?accessToken={{accessToken}}&clientIdentifier={{clientIdentifier}}&remotePath=/XXX")
+ .to("dropbox://del?accessToken={{accessToken}}&remotePath=/XXX")
.to("mock:result");
from("direct:start2")
.setHeader(DropboxConstants.HEADER_REMOTE_PATH, constant("/XXX"))
- .to("dropbox://del?accessToken={{accessToken}}&clientIdentifier={{clientIdentifier}}")
+ .to("dropbox://del?accessToken={{accessToken}}")
.to("mock:result");
}
};
http://git-wip-us.apache.org/repos/asf/camel/blob/2c1c1b6c/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 1eb3779..f39d213 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
@@ -116,21 +116,21 @@ public class DropboxProducerGetFolderTest extends DropboxTestSupport {
return new RouteBuilder() {
public void configure() {
from("direct:start")
- .to("dropbox://get?accessToken={{accessToken}}&clientIdentifier={{clientIdentifier}}&remotePath=/XXX")
+ .to("dropbox://get?accessToken={{accessToken}}&remotePath=/XXX")
.to("mock:result");
from("direct:start2")
.setHeader(DropboxConstants.HEADER_REMOTE_PATH, constant("/XXX"))
- .to("dropbox://get?accessToken={{accessToken}}&clientIdentifier={{clientIdentifier}}")
+ .to("dropbox://get?accessToken={{accessToken}}")
.to("mock:result");
from("direct:start3")
- .to("dropbox://get?accessToken={{accessToken}}&clientIdentifier={{clientIdentifier}}")
+ .to("dropbox://get?accessToken={{accessToken}}")
.to("mock:result");
from("direct:start4")
.setHeader(DropboxConstants.HEADER_REMOTE_PATH, constant("/XXX"))
- .to("dropbox://get?accessToken={{accessToken}}&clientIdentifier={{clientIdentifier}}&remotePath=/aWrongPath")
+ .to("dropbox://get?accessToken={{accessToken}}&remotePath=/aWrongPath")
.to("mock:result");
}
http://git-wip-us.apache.org/repos/asf/camel/blob/2c1c1b6c/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 30563b3..27f604b 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
@@ -80,13 +80,13 @@ public class DropboxProducerGetSingleTest extends DropboxTestSupport {
return new RouteBuilder() {
public void configure() {
from("direct:start")
- .to("dropbox://get?accessToken={{accessToken}}&clientIdentifier={{clientIdentifier}}&remotePath=/XXX")
+ .to("dropbox://get?accessToken={{accessToken}}&remotePath=/XXX")
.to("file:///XXX?fileName=XXX")
.to("mock:result");
from("direct:start2")
.setHeader(DropboxConstants.HEADER_REMOTE_PATH, constant("/XXX"))
- .to("dropbox://get?accessToken={{accessToken}}&clientIdentifier={{clientIdentifier}}")
+ .to("dropbox://get?accessToken={{accessToken}}")
.to("file:///XXX?fileName=XXX")
.to("mock:result");
}
http://git-wip-us.apache.org/repos/asf/camel/blob/2c1c1b6c/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 b5005e7..f396897 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
@@ -80,13 +80,13 @@ public class DropboxProducerMoveTest extends DropboxTestSupport {
return new RouteBuilder() {
public void configure() {
from("direct:start")
- .to("dropbox://move?accessToken={{accessToken}}&clientIdentifier={{clientIdentifier}}&remotePath=/XXX&newRemotePath=/XXX")
+ .to("dropbox://move?accessToken={{accessToken}}&remotePath=/XXX&newRemotePath=/XXX")
.to("mock:result");
from("direct:start2")
.setHeader(DropboxConstants.HEADER_REMOTE_PATH, constant("/XXX"))
.setHeader(DropboxConstants.HEADER_NEW_REMOTE_PATH, constant("/XXX"))
- .to("dropbox://move?accessToken={{accessToken}}&clientIdentifier={{clientIdentifier}}")
+ .to("dropbox://move?accessToken={{accessToken}}")
.to("mock:result");
}
};
http://git-wip-us.apache.org/repos/asf/camel/blob/2c1c1b6c/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 c51f7f5..a4acea7 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
@@ -81,13 +81,13 @@ public class DropboxProducerPutSingleFileTest extends DropboxTestSupport {
return new RouteBuilder() {
public void configure() {
from("direct:start")
- .to("dropbox://put?accessToken={{accessToken}}&clientIdentifier={{clientIdentifier}}&uploadMode=add&localPath=/XXX")
+ .to("dropbox://put?accessToken={{accessToken}}&uploadMode=add&localPath=/XXX")
.to("mock:result");
from("direct:start2")
.setHeader(DropboxConstants.HEADER_LOCAL_PATH, constant("/XXX"))
.setHeader(DropboxConstants.HEADER_UPLOAD_MODE, constant(DropboxUploadMode.add))
- .to("dropbox://put?accessToken={{accessToken}}&clientIdentifier={{clientIdentifier}}")
+ .to("dropbox://put?accessToken={{accessToken}}")
.to("mock:result");
}
};
http://git-wip-us.apache.org/repos/asf/camel/blob/2c1c1b6c/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 8b1c7e0..42bd460 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
@@ -81,14 +81,14 @@ public class DropboxProducerPutSingleFileWithRemotePathTest extends DropboxTestS
return new RouteBuilder() {
public void configure() {
from("direct:start")
- .to("dropbox://put?accessToken={{accessToken}}&clientIdentifier={{clientIdentifier}}&uploadMode=add&localPath=/XXX&remotePath=/XXX")
+ .to("dropbox://put?accessToken={{accessToken}}&uploadMode=add&localPath=/XXX&remotePath=/XXX")
.to("mock:result");
from("direct:start2")
.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("dropbox://put?accessToken={{accessToken}}")
.to("mock:result");
}
};
http://git-wip-us.apache.org/repos/asf/camel/blob/2c1c1b6c/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 433d084..2de352c 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
@@ -80,14 +80,14 @@ public class DropboxProducerPutWithRemotePathTest extends DropboxTestSupport {
return new RouteBuilder() {
public void configure() {
from("direct:start")
- .to("dropbox://put?accessToken={{accessToken}}&clientIdentifier={{clientIdentifier}}&uploadMode=add&localPath=/XXX&remotePath=/XXX")
+ .to("dropbox://put?accessToken={{accessToken}}&uploadMode=add&localPath=/XXX&remotePath=/XXX")
.to("mock:result");
from("direct:start2")
.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("dropbox://put?accessToken={{accessToken}}")
.to("mock:result");
}
};
http://git-wip-us.apache.org/repos/asf/camel/blob/2c1c1b6c/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 04a1d64..4c8939f 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
@@ -83,13 +83,13 @@ public class DropboxProducerSearchQueryTest extends DropboxTestSupport {
return new RouteBuilder() {
public void configure() {
from("direct:start")
- .to("dropbox://search?accessToken={{accessToken}}&clientIdentifier={{clientIdentifier}}&remotePath=/XXX&query=XXX")
+ .to("dropbox://search?accessToken={{accessToken}}&remotePath=/XXX&query=XXX")
.to("mock:result");
from("direct:start2")
.setHeader(DropboxConstants.HEADER_REMOTE_PATH, constant("/XXX"))
.setHeader(DropboxConstants.HEADER_QUERY, constant("/XXX"))
- .to("dropbox://search?accessToken={{accessToken}}&clientIdentifier={{clientIdentifier}}")
+ .to("dropbox://search?accessToken={{accessToken}}")
.to("mock:result");
}
};
http://git-wip-us.apache.org/repos/asf/camel/blob/2c1c1b6c/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 83ac334..38ce2aa 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
@@ -79,12 +79,12 @@ public class DropboxProducerSearchTest extends DropboxTestSupport {
return new RouteBuilder() {
public void configure() {
from("direct:start")
- .to("dropbox://search?accessToken={{accessToken}}&clientIdentifier={{clientIdentifier}}&remotePath=/XXX")
+ .to("dropbox://search?accessToken={{accessToken}}&remotePath=/XXX")
.to("mock:result");
from("direct:start")
.setHeader(DropboxConstants.HEADER_REMOTE_PATH, constant("/XXX"))
- .to("dropbox://search?accessToken={{accessToken}}&clientIdentifier={{clientIdentifier}}")
+ .to("dropbox://search?accessToken={{accessToken}}")
.to("mock:result");
}
};
[2/2] camel git commit: Component docs as valid ascii doc. This
closes #2004
Posted by da...@apache.org.
Component docs as valid ascii doc. This closes #2004
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/f4e3ec1a
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/f4e3ec1a
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/f4e3ec1a
Branch: refs/heads/master
Commit: f4e3ec1ac4fbec6eec308d41d48ed37f1297a027
Parents: 2c1c1b6
Author: Claus Ibsen <da...@apache.org>
Authored: Sat Oct 7 11:11:51 2017 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Sat Oct 7 11:12:14 2017 +0200
----------------------------------------------------------------------
.../src/main/docs/dropbox-component.adoc | 174 ++++++++++---------
1 file changed, 95 insertions(+), 79 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/f4e3ec1a/components/camel-dropbox/src/main/docs/dropbox-component.adoc
----------------------------------------------------------------------
diff --git a/components/camel-dropbox/src/main/docs/dropbox-component.adoc b/components/camel-dropbox/src/main/docs/dropbox-component.adoc
index 0e8db8a..beae12f 100644
--- a/components/camel-dropbox/src/main/docs/dropbox-component.adoc
+++ b/components/camel-dropbox/src/main/docs/dropbox-component.adoc
@@ -26,17 +26,17 @@ for this component:
</dependency>
------------------------------------------------------------
-### URI format
+=== URI format
-[source,java]
--------------------------------
+[source]
+----
dropbox://[operation]?[options]
--------------------------------
+----
Where *operation* is the specific action (typically is a CRUD action) to
perform on Dropbox remote folder.
-### Operations
+=== Operations
[width="100%",cols="40%,60%",options="header",]
|=======================================================================
@@ -56,7 +56,7 @@ perform on Dropbox remote folder.
*Operations* require additional options to work, some are mandatory for
the specific operation.
-### Options
+=== Options
In order to work with Dropbox API you need to obtain an *accessToken*
and a *clientIdentifier.* +
@@ -105,7 +105,7 @@ with the following path and query parameters:
|===
// endpoint options: END
-### Del operation
+=== Del operation
Delete files on Dropbox.
@@ -114,44 +114,48 @@ Works only as Camel producer.
Below are listed the options for this operation:
[width="100%",cols="20%,20%,60%",options="header",]
-|=======================================================================
+|===
|Property |Mandatory |Description
|`remotePath` |`true` |Folder or file to delete on Dropbox
-|=======================================================================
+|===
-#### Samples
+==== Samples
[source,java]
--------------------------------
-from("direct:start").to("dropbox://del?accessToken=XXX&clientIdentifier=XXX&remotePath=/root/folder1").to("mock:result");
+----
+from("direct:start")
+ .to("dropbox://del?accessToken=XXX&clientIdentifier=XXX&remotePath=/root/folder1")
+ .to("mock:result");
-from("direct:start").to("dropbox://del?accessToken=XXX&clientIdentifier=XXX&remotePath=/root/folder1/file1.tar.gz").to("mock:result");
--------------------------------
+from("direct:start")
+ .to("dropbox://del?accessToken=XXX&clientIdentifier=XXX&remotePath=/root/folder1/file1.tar.gz")
+ .to("mock:result");
+----
-#### Result Message Headers
+==== Result Message Headers
The following headers are set on message result:
[width="100%",cols="50%,50%",options="header",]
-|=======================================================================
+|===
|Property |Value
|`DELETED_PATH` |name of the path deleted on dropbox
-|=======================================================================
+|===
-#### Result Message Body
+==== Result Message Body
The following objects are set on message body result:
[width="100%",cols="50%,50%",options="header",]
-|=======================================================================
+|===
|Object type |Description
|`String` |name of the path deleted on dropbox
-|=======================================================================
+|===
-### Get (download) operation
+=== Get (download) operation
Download files from Dropbox.
@@ -160,42 +164,47 @@ Works as Camel producer or Camel consumer.
Below are listed the options for this operation:
[width="100%",cols="20%,20%,60%",options="header",]
-|=======================================================================
+|===
|Property |Mandatory |Description
|`remotePath` |`true` |Folder or file to download from Dropbox
-|=======================================================================
+|===
-#### Samples
+==== Samples
[source,java]
--------------------------------
-from("direct:start").to("dropbox://get?accessToken=XXX&clientIdentifier=XXX&remotePath=/root/folder1/file1.tar.gz").to("file:///home/kermit/?fileName=file1.tar.gz");
+----
+from("direct:start")
+ .to("dropbox://get?accessToken=XXX&clientIdentifier=XXX&remotePath=/root/folder1/file1.tar.gz")
+ .to("file:///home/kermit/?fileName=file1.tar.gz");
-from("direct:start").to("dropbox://get?accessToken=XXX&clientIdentifier=XXX&remotePath=/root/folder1").to("mock:result");
+from("direct:start")
+ .to("dropbox://get?accessToken=XXX&clientIdentifier=XXX&remotePath=/root/folder1")
+ .to("mock:result");
-from("dropbox://get?accessToken=XXX&clientIdentifier=XXX&remotePath=/root/folder1").to("file:///home/kermit/");
--------------------------------
+from("dropbox://get?accessToken=XXX&clientIdentifier=XXX&remotePath=/root/folder1")
+ .to("file:///home/kermit/");
+----
-#### Result Message Headers
+==== Result Message Headers
The following headers are set on message result:
[width="100%",cols="50%,50%",options="header",]
-|=======================================================================
+|===
|Property |Value
|`DOWNLOADED_FILE` |in case of single file download, path of the remote file downloaded
|`DOWNLOADED_FILES` |in case of multiple files download, path of the remote files downloaded
-|=======================================================================
+|===
-#### Result Message Body
+==== Result Message Body
The following objects are set on message body result:
[width="100%",cols="50%,50%",options="header",]
-|=======================================================================
+|===
|Object type |Description
|`ByteArrayOutputStream` |in case of single file download, stream representing the file downloaded
@@ -203,9 +212,9 @@ The following objects are set on message body result:
|`Map<String, ByteArrayOutputStream>` |in case of multiple files download, a map with as key the path of the
remote file downloaded and as value the stream representing the file
downloaded
-|=======================================================================
+|===
-### Move operation
+=== Move operation
Move files on Dropbox between one folder to another.
@@ -214,44 +223,46 @@ Works only as Camel producer.
Below are listed the options for this operation:
[width="100%",cols="20%,20%,60%",options="header",]
-|=======================================================================
+|===
|Property |Mandatory |Description
|`remotePath` |`true` |Original file or folder to move
|`newRemotePath` |`true` |Destination file or folder
-|=======================================================================
+|===
-#### Samples
+==== Samples
[source,java]
--------------------------------
-from("direct:start").to("dropbox://move?accessToken=XXX&clientIdentifier=XXX&remotePath=/root/folder1&newRemotePath=/root/folder2").to("mock:result");
--------------------------------
+----
+from("direct:start")
+ .to("dropbox://move?accessToken=XXX&clientIdentifier=XXX&remotePath=/root/folder1&newRemotePath=/root/folder2")
+ .to("mock:result");
+----
-#### Result Message Headers
+==== Result Message Headers
The following headers are set on message result:
[width="100%",cols="50%,50%",options="header",]
-|=======================================================================
+|===
|Property |Value
|`MOVED_PATH` |name of the path moved on dropbox
-|=======================================================================
+|===
-#### Result Message Body
+==== Result Message Body
The following objects are set on message body result:
[width="100%",cols="50%,50%",options="header",]
-|=======================================================================
+|===
|Object type |Description
|`String` |name of the path moved on dropbox
-|=======================================================================
+|===
-### Put (upload) operation
+=== Put (upload) operation
Upload files on Dropbox.
@@ -260,7 +271,7 @@ Works as Camel producer.
Below are listed the options for this operation:
[width="100%",cols="20%,20%,60%",options="header",]
-|=======================================================================
+|===
|Property |Mandatory |Description
|`uploadMode` |`true` |add or force this option specifies how a file should be saved on
@@ -280,50 +291,52 @@ Caused by: java.lang.IllegalArgumentException: 'path': bad path: must start with
OR +
Caused by: java.lang.IllegalArgumentException: 'path': bad path: must start with "/": "MyFile" +
-|=======================================================================
+|===
-#### Samples
+==== Samples
[source,java]
--------------------------------
-from("direct:start").to("dropbox://put?accessToken=XXX&clientIdentifier=XXX&uploadMode=add&localPath=/root/folder1").to("mock:result");
+----
+from("direct:start").to("dropbox://put?accessToken=XXX&clientIdentifier=XXX&uploadMode=add&localPath=/root/folder1")
+ .to("mock:result");
-from("direct:start").to("dropbox://put?accessToken=XXX&clientIdentifier=XXX&uploadMode=add&localPath=/root/folder1&remotePath=/root/folder2").to("mock:result");
--------------------------------
+from("direct:start").to("dropbox://put?accessToken=XXX&clientIdentifier=XXX&uploadMode=add&localPath=/root/folder1&remotePath=/root/folder2")
+ .to("mock:result");
+----
And to upload a single file with content from the message body
[source,java]
--------------------------------
+----
from("direct:start")
.setHeader(DropboxConstants.HEADER_PUT_FILE_NAME, constant("myfile.txt"))
.to("dropbox://put?accessToken=XXX&clientIdentifier=XXX&uploadMode=add&remotePath=/root/folder2")
.to("mock:result");
--------------------------------
+----
The name of the file can be provided in the header `DropboxConstants.HEADER_PUT_FILE_NAME`
or `Exchange.FILE_NAME` in that order of precedence. If no header has been provided then the message id (uuid) is
used as the file name.
-#### Result Message Headers
+==== Result Message Headers
The following headers are set on message result:
[width="100%",cols="50%,50%",options="header",]
-|=======================================================================
+|===
|Property |Value
|`UPLOADED_FILE` |in case of single file upload, path of the remote path uploaded
|`UPLOADED_FILES` |in case of multiple files upload, string with the remote paths uploaded
-|=======================================================================
+|===
-#### Result Message Body
+==== Result Message Body
The following objects are set on message body result:
[width="100%",cols="50%,50%",options="header",]
-|=======================================================================
+|===
|Object type |Description
|`String` |in case of single file upload, result of the upload operation, OK or KO
@@ -331,9 +344,9 @@ The following objects are set on message body result:
|`Map<String, DropboxResultCode>` |in case of multiple files upload, a map with as key the path of the
remote file uploaded and as value the result of the upload operation, OK
or KO
-|=======================================================================
+|===
-### Search operation
+=== Search operation
Search inside a remote Dropbox folder including its sub directories.
@@ -342,7 +355,7 @@ Works as Camel producer and as Camel consumer.
Below are listed the options for this operation:
[width="100%",cols="20%,20%,60%",options="header",]
-|=======================================================================
+|===
|Property |Mandatory |Description
|`remotePath` |`true` |Folder on Dropbox where to search in.
@@ -350,40 +363,43 @@ Below are listed the options for this operation:
|`query` |`false` |A space-separated list of sub-strings to search for. A file matches only
if it contains all the sub-strings. If this option is not set, all files
will be matched.
-|=======================================================================
+|===
-#### Samples
+==== Samples
[source,java]
--------------------------------
-from("dropbox://search?accessToken=XXX&clientIdentifier=XXX&remotePath=/XXX&query=XXX").to("mock:result");
+----
+from("dropbox://search?accessToken=XXX&clientIdentifier=XXX&remotePath=/XXX&query=XXX")
+ .to("mock:result");
-from("direct:start").to("dropbox://search?accessToken=XXX&clientIdentifier=XXX&remotePath=/XXX").to("mock:result");
--------------------------------
+from("direct:start")
+ .to("dropbox://search?accessToken=XXX&clientIdentifier=XXX&remotePath=/XXX")
+ .to("mock:result");
+----
-#### Result Message Headers
+==== Result Message Headers
The following headers are set on message result:
[width="100%",cols="50%,50%",options="header",]
-|=======================================================================
+|===
|Property |Value
|`FOUNDED_FILES` |list of file path founded
-|=======================================================================
+|===
-#### Result Message Body
+==== Result Message Body
The following objects are set on message body result:
[width="100%",cols="50%,50%",options="header",]
-|=======================================================================
+|===
|Object type |Description
|`List<DbxEntry>` |list of file path founded. For more information on this object refer to
Dropbox documentation,
-|=======================================================================
+|===
+
-link:http://dropbox.github.io/dropbox-sdk-java/api-docs/v1.7.x/com/dropbox/core/DbxEntry.html[http://dropbox.github.io/dropbox-sdk-java/api-docs/v1.7.x/com/dropbox/core/DbxEntry.html]