You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ja...@apache.org on 2014/12/16 21:05:42 UTC

[2/2] camel git commit: CAMEL-8158 - Provide way to specify fields to patch in google drive endpoints

CAMEL-8158 - Provide way to specify fields to patch in google drive endpoints


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

Branch: refs/heads/camel-2.14.x
Commit: 63f4fbbbf84e13c26b0d0781af828cace939b83d
Parents: f5e1387
Author: Jonathan Anstey <ja...@gmail.com>
Authored: Tue Dec 16 16:34:27 2014 -0330
Committer: Jonathan Anstey <ja...@gmail.com>
Committed: Tue Dec 16 16:35:11 2014 -0330

----------------------------------------------------------------------
 .../google/drive/GoogleDriveConsumer.java       |  1 +
 .../google/drive/GoogleDriveProducer.java       |  1 +
 .../google/drive/DriveFilesIntegrationTest.java | 23 ++++++++------------
 3 files changed, 11 insertions(+), 14 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/63f4fbbb/components/camel-google-drive/src/main/java/org/apache/camel/component/google/drive/GoogleDriveConsumer.java
----------------------------------------------------------------------
diff --git a/components/camel-google-drive/src/main/java/org/apache/camel/component/google/drive/GoogleDriveConsumer.java b/components/camel-google-drive/src/main/java/org/apache/camel/component/google/drive/GoogleDriveConsumer.java
index 266aa27..e08e9b2 100644
--- a/components/camel-google-drive/src/main/java/org/apache/camel/component/google/drive/GoogleDriveConsumer.java
+++ b/components/camel-google-drive/src/main/java/org/apache/camel/component/google/drive/GoogleDriveConsumer.java
@@ -47,6 +47,7 @@ public class GoogleDriveConsumer extends AbstractApiConsumer<GoogleDriveApiName,
             setProperty(properties, request, "q");
             setProperty(properties, request, "maxResults");
             setProperty(properties, request, "pageToken");
+            setProperty(properties, request, "fields");
             return request.execute();
         } catch (Exception e) {
             throw new RuntimeCamelException(e);

http://git-wip-us.apache.org/repos/asf/camel/blob/63f4fbbb/components/camel-google-drive/src/main/java/org/apache/camel/component/google/drive/GoogleDriveProducer.java
----------------------------------------------------------------------
diff --git a/components/camel-google-drive/src/main/java/org/apache/camel/component/google/drive/GoogleDriveProducer.java b/components/camel-google-drive/src/main/java/org/apache/camel/component/google/drive/GoogleDriveProducer.java
index 55b815a..9762f0c 100644
--- a/components/camel-google-drive/src/main/java/org/apache/camel/component/google/drive/GoogleDriveProducer.java
+++ b/components/camel-google-drive/src/main/java/org/apache/camel/component/google/drive/GoogleDriveProducer.java
@@ -45,6 +45,7 @@ public class GoogleDriveProducer extends AbstractApiProducer<GoogleDriveApiName,
             setProperty(properties, request, "q");
             setProperty(properties, request, "maxResults");
             setProperty(properties, request, "pageToken");
+            setProperty(properties, request, "fields");
             return request.execute();
         } catch (Exception e) {
             throw new RuntimeCamelException(e);

http://git-wip-us.apache.org/repos/asf/camel/blob/63f4fbbb/components/camel-google-drive/src/test/java/org/apache/camel/component/google/drive/DriveFilesIntegrationTest.java
----------------------------------------------------------------------
diff --git a/components/camel-google-drive/src/test/java/org/apache/camel/component/google/drive/DriveFilesIntegrationTest.java b/components/camel-google-drive/src/test/java/org/apache/camel/component/google/drive/DriveFilesIntegrationTest.java
index 624ef7b..e61d833 100644
--- a/components/camel-google-drive/src/test/java/org/apache/camel/component/google/drive/DriveFilesIntegrationTest.java
+++ b/components/camel-google-drive/src/test/java/org/apache/camel/component/google/drive/DriveFilesIntegrationTest.java
@@ -149,30 +149,25 @@ public class DriveFilesIntegrationTest extends AbstractGoogleDriveTestSupport {
         assertFalse(resultList.get(0).getId().equals(resultList.get(1)));
     }
 
-    @Ignore
     @Test
     public void testPatch() throws Exception {
-        // TODO have to support setting patch parameters before calling execute like:
-        /*
-      File file = new File();
-      file.setTitle(newTitle);
-
-      // Rename the file using a patch request.
-      Files.Patch patchRequest = service.files().patch(fileId, file);
-      patchRequest.setFields("title");
+        File file = uploadTestFile();
 
-      File updatedFile = patchRequest.execute();
-         */        
+        // lets update the filename
+        file.setTitle(UPLOAD_FILE.getName() + "PATCHED");
         
         final Map<String, Object> headers = new HashMap<String, Object>();
         // parameter type is String
-        headers.put("CamelGoogleDrive.fileId", null);
+        headers.put("CamelGoogleDrive.fileId", file.getId());
+        // parameter type is String
+        headers.put("CamelGoogleDrive.fields", "title");       
         // parameter type is com.google.api.services.drive.model.File
-        headers.put("CamelGoogleDrive.content", null);
+        headers.put("CamelGoogleDrive.content", file);
 
-        final com.google.api.services.drive.Drive.Files.Patch result = requestBodyAndHeaders("direct://PATCH", null, headers);
+        File result = requestBodyAndHeaders("direct://PATCH", null, headers);
 
         assertNotNull("patch result", result);
+        assertEquals(UPLOAD_FILE.getName() + "PATCHED", result.getTitle());
         LOG.debug("patch: " + result);
     }