You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ni...@apache.org on 2014/09/08 16:32:25 UTC

git commit: Fixed the CS errors of camel-google-drive

Repository: camel
Updated Branches:
  refs/heads/master 58a9ffb4a -> 17bb643ec


Fixed the CS errors of camel-google-drive


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

Branch: refs/heads/master
Commit: 17bb643ecf362cf8ba54760dce79a55f05749262
Parents: 58a9ffb
Author: Willem Jiang <wi...@gmail.com>
Authored: Mon Sep 8 22:31:58 2014 +0800
Committer: Willem Jiang <wi...@gmail.com>
Committed: Mon Sep 8 22:31:58 2014 +0800

----------------------------------------------------------------------
 .../drive/BatchGoogleDriveClientFactory.java    | 15 ++--
 .../google/drive/GoogleDriveClientFactory.java  |  2 +-
 .../google/drive/GoogleDriveComponent.java      | 15 ++--
 .../google/drive/GoogleDriveConsumer.java       |  7 +-
 .../google/drive/GoogleDriveEndpoint.java       | 84 ++++++++++----------
 .../google/drive/GoogleDriveFilesConverter.java | 13 ++-
 .../google/drive/GoogleDriveProducer.java       |  8 +-
 .../InteractiveGoogleDriveClientFactory.java    | 16 ++--
 .../internal/GoogleDrivePropertiesHelper.java   |  3 +-
 .../drive/AbstractGoogleDriveTestSupport.java   | 24 +++---
 .../google/drive/DriveAboutIntegrationTest.java |  7 +-
 .../google/drive/DriveAppsIntegrationTest.java  |  9 +--
 .../drive/DriveChangesIntegrationTest.java      | 14 ++--
 .../drive/DriveChildrenIntegrationTest.java     | 17 ++--
 .../drive/DriveCommentsIntegrationTest.java     | 26 +++---
 .../google/drive/DriveFilesIntegrationTest.java | 44 +++++-----
 .../drive/DrivePermissionsIntegrationTest.java  | 23 +++---
 .../drive/DrivePropertiesIntegrationTest.java   | 21 +++--
 .../drive/DriveRepliesIntegrationTest.java      | 30 +++----
 .../drive/DriveRevisionsIntegrationTest.java    | 19 +++--
 .../drive/FileConverterIntegrationTest.java     | 18 ++---
 .../drive/FilesConsumerIntegrationTest.java     | 11 ++-
 22 files changed, 206 insertions(+), 220 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/17bb643e/components/camel-google-drive/src/main/java/org/apache/camel/component/google/drive/BatchGoogleDriveClientFactory.java
----------------------------------------------------------------------
diff --git a/components/camel-google-drive/src/main/java/org/apache/camel/component/google/drive/BatchGoogleDriveClientFactory.java b/components/camel-google-drive/src/main/java/org/apache/camel/component/google/drive/BatchGoogleDriveClientFactory.java
index 9d62ebe..0e736bc 100644
--- a/components/camel-google-drive/src/main/java/org/apache/camel/component/google/drive/BatchGoogleDriveClientFactory.java
+++ b/components/camel-google-drive/src/main/java/org/apache/camel/component/google/drive/BatchGoogleDriveClientFactory.java
@@ -18,15 +18,15 @@ package org.apache.camel.component.google.drive;
 
 import java.util.Collection;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import com.google.api.client.auth.oauth2.Credential;
 import com.google.api.client.googleapis.auth.oauth2.GoogleCredential;
 import com.google.api.client.http.javanet.NetHttpTransport;
 import com.google.api.client.json.jackson2.JacksonFactory;
 import com.google.api.services.drive.Drive;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 public class BatchGoogleDriveClientFactory implements GoogleDriveClientFactory {
     private static final Logger LOG = LoggerFactory.getLogger(BatchGoogleDriveClientFactory.class);
     private NetHttpTransport transport;
@@ -53,10 +53,9 @@ public class BatchGoogleDriveClientFactory implements GoogleDriveClientFactory {
     private Credential authorize(String clientId, String clientSecret, Collection<String> scopes, String refreshToken) throws Exception {
         // authorize
         return new GoogleCredential.Builder()
-        .setJsonFactory(jsonFactory)
-        .setTransport(transport)
-        .setClientSecrets(clientId, clientSecret)
-        .build()
-        .setRefreshToken(refreshToken);
+            .setJsonFactory(jsonFactory)
+            .setTransport(transport)
+            .setClientSecrets(clientId, clientSecret)
+            .build().setRefreshToken(refreshToken);
     }
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/camel/blob/17bb643e/components/camel-google-drive/src/main/java/org/apache/camel/component/google/drive/GoogleDriveClientFactory.java
----------------------------------------------------------------------
diff --git a/components/camel-google-drive/src/main/java/org/apache/camel/component/google/drive/GoogleDriveClientFactory.java b/components/camel-google-drive/src/main/java/org/apache/camel/component/google/drive/GoogleDriveClientFactory.java
index 10a0089..0b87f2a 100644
--- a/components/camel-google-drive/src/main/java/org/apache/camel/component/google/drive/GoogleDriveClientFactory.java
+++ b/components/camel-google-drive/src/main/java/org/apache/camel/component/google/drive/GoogleDriveClientFactory.java
@@ -22,6 +22,6 @@ import com.google.api.services.drive.Drive;
 
 public interface GoogleDriveClientFactory {
 
-    public abstract Drive makeClient(String clientId, String clientSecret, Collection<String> scopes, String applicationName, String refreshToken);
+    Drive makeClient(String clientId, String clientSecret, Collection<String> scopes, String applicationName, String refreshToken);
 
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/camel/blob/17bb643e/components/camel-google-drive/src/main/java/org/apache/camel/component/google/drive/GoogleDriveComponent.java
----------------------------------------------------------------------
diff --git a/components/camel-google-drive/src/main/java/org/apache/camel/component/google/drive/GoogleDriveComponent.java b/components/camel-google-drive/src/main/java/org/apache/camel/component/google/drive/GoogleDriveComponent.java
index 56cc76b..ded60da 100644
--- a/components/camel-google-drive/src/main/java/org/apache/camel/component/google/drive/GoogleDriveComponent.java
+++ b/components/camel-google-drive/src/main/java/org/apache/camel/component/google/drive/GoogleDriveComponent.java
@@ -19,28 +19,27 @@ package org.apache.camel.component.google.drive;
 import java.util.Arrays;
 import java.util.List;
 
+import com.google.api.services.drive.Drive;
+import com.google.api.services.drive.DriveScopes;
+
 import org.apache.camel.CamelContext;
 import org.apache.camel.Endpoint;
-import org.apache.camel.spi.UriEndpoint;
-import org.apache.camel.util.component.AbstractApiComponent;
 import org.apache.camel.component.google.drive.internal.GoogleDriveApiCollection;
 import org.apache.camel.component.google.drive.internal.GoogleDriveApiName;
-
-import com.google.api.services.drive.Drive;
-import com.google.api.services.drive.DriveScopes;
+import org.apache.camel.spi.UriEndpoint;
+import org.apache.camel.util.component.AbstractApiComponent;
 
 /**
  * Represents the component that manages {@link GoogleDriveEndpoint}.
  */
 @UriEndpoint(scheme = "google-drive", consumerClass = GoogleDriveConsumer.class, consumerPrefix = "consumer")
 public class GoogleDriveComponent extends AbstractApiComponent<GoogleDriveApiName, GoogleDriveConfiguration, GoogleDriveApiCollection> {
+    private static final List<String> DEFAULT_SCOPES = Arrays.asList(DriveScopes.DRIVE_FILE, DriveScopes.DRIVE_APPS_READONLY, DriveScopes.DRIVE_METADATA_READONLY,
+                                                                     DriveScopes.DRIVE); 
     private Drive client;
     private GoogleDriveClientFactory clientFactory;
     private List<String> scopes = DEFAULT_SCOPES;
     
-    private static final List<String> DEFAULT_SCOPES = Arrays.asList(DriveScopes.DRIVE_FILE, DriveScopes.DRIVE_APPS_READONLY, DriveScopes.DRIVE_METADATA_READONLY,
-            DriveScopes.DRIVE); 
-    
     public GoogleDriveComponent() {
         super(GoogleDriveEndpoint.class, GoogleDriveApiName.class, GoogleDriveApiCollection.getCollection());
     }

http://git-wip-us.apache.org/repos/asf/camel/blob/17bb643e/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 077a913..0505bcf 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
@@ -19,16 +19,15 @@ package org.apache.camel.component.google.drive;
 import java.io.IOException;
 import java.util.Map;
 
+import com.google.api.client.googleapis.services.AbstractGoogleClientRequest;
+
 import org.apache.camel.Processor;
 import org.apache.camel.RuntimeCamelException;
-import org.apache.camel.util.component.AbstractApiConsumer;
-import org.apache.camel.util.component.ApiMethod;
 import org.apache.camel.component.google.drive.internal.GoogleDriveApiName;
+import org.apache.camel.util.component.AbstractApiConsumer;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.google.api.client.googleapis.services.AbstractGoogleClientRequest;
-
 /**
  * The GoogleDrive consumer.
  */

http://git-wip-us.apache.org/repos/asf/camel/blob/17bb643e/components/camel-google-drive/src/main/java/org/apache/camel/component/google/drive/GoogleDriveEndpoint.java
----------------------------------------------------------------------
diff --git a/components/camel-google-drive/src/main/java/org/apache/camel/component/google/drive/GoogleDriveEndpoint.java b/components/camel-google-drive/src/main/java/org/apache/camel/component/google/drive/GoogleDriveEndpoint.java
index f07b90f..f7ee052 100644
--- a/components/camel-google-drive/src/main/java/org/apache/camel/component/google/drive/GoogleDriveEndpoint.java
+++ b/components/camel-google-drive/src/main/java/org/apache/camel/component/google/drive/GoogleDriveEndpoint.java
@@ -18,19 +18,19 @@ package org.apache.camel.component.google.drive;
 
 import java.util.Map;
 
+import com.google.api.services.drive.Drive;
+
 import org.apache.camel.Consumer;
 import org.apache.camel.Processor;
 import org.apache.camel.Producer;
-import org.apache.camel.spi.UriEndpoint;
-import org.apache.camel.util.component.AbstractApiEndpoint;
-import org.apache.camel.util.component.ApiMethod;
-import org.apache.camel.util.component.ApiMethodPropertiesHelper;
 import org.apache.camel.component.google.drive.internal.GoogleDriveApiCollection;
 import org.apache.camel.component.google.drive.internal.GoogleDriveApiName;
 import org.apache.camel.component.google.drive.internal.GoogleDriveConstants;
 import org.apache.camel.component.google.drive.internal.GoogleDrivePropertiesHelper;
-
-import com.google.api.services.drive.Drive;
+import org.apache.camel.spi.UriEndpoint;
+import org.apache.camel.util.component.AbstractApiEndpoint;
+import org.apache.camel.util.component.ApiMethod;
+import org.apache.camel.util.component.ApiMethodPropertiesHelper;
 
 /**
  * Represents a GoogleDrive endpoint.
@@ -70,42 +70,42 @@ public class GoogleDriveEndpoint extends AbstractApiEndpoint<GoogleDriveApiName,
     
     @Override
     protected void afterConfigureProperties() {
-        switch ((GoogleDriveApiName) apiName) {
-            case DRIVE_FILES:
-                apiProxy = getClient().files();
-                break;
-            case DRIVE_ABOUT:
-                apiProxy = getClient().about();
-                break;                
-            case DRIVE_APPS:
-                apiProxy = getClient().apps();
-                break;         
-            case DRIVE_CHANGES:
-                apiProxy = getClient().changes();
-                break;                
-            case DRIVE_COMMENTS:
-                apiProxy = getClient().comments();
-                break;                
-            case DRIVE_PERMISSIONS:
-                apiProxy = getClient().permissions();                
-                break;                    
-            case DRIVE_PROPERTIES:
-                apiProxy = getClient().properties();                
-                break;                        
-            case DRIVE_REPLIES:
-                apiProxy = getClient().replies();                
-                break;                    
-            case DRIVE_REVISIONS:
-                apiProxy = getClient().revisions();                
-                break;                    
-            case DRIVE_CHILDREN:
-                apiProxy = getClient().children();
-                break;
-            case DRIVE_PARENTS:
-                apiProxy = getClient().parents();
-                break;
-            default:
-                throw new IllegalArgumentException("Invalid API name " + apiName);
+        switch ((GoogleDriveApiName)apiName) {
+        case DRIVE_FILES:
+            apiProxy = getClient().files();
+            break;
+        case DRIVE_ABOUT:
+            apiProxy = getClient().about();
+            break;
+        case DRIVE_APPS:
+            apiProxy = getClient().apps();
+            break;
+        case DRIVE_CHANGES:
+            apiProxy = getClient().changes();
+            break;
+        case DRIVE_COMMENTS:
+            apiProxy = getClient().comments();
+            break;
+        case DRIVE_PERMISSIONS:
+            apiProxy = getClient().permissions();
+            break;
+        case DRIVE_PROPERTIES:
+            apiProxy = getClient().properties();
+            break;
+        case DRIVE_REPLIES:
+            apiProxy = getClient().replies();
+            break;
+        case DRIVE_REVISIONS:
+            apiProxy = getClient().revisions();
+            break;
+        case DRIVE_CHILDREN:
+            apiProxy = getClient().children();
+            break;
+        case DRIVE_PARENTS:
+            apiProxy = getClient().parents();
+            break;
+        default:
+            throw new IllegalArgumentException("Invalid API name " + apiName);
         } 
     }
     

http://git-wip-us.apache.org/repos/asf/camel/blob/17bb643e/components/camel-google-drive/src/main/java/org/apache/camel/component/google/drive/GoogleDriveFilesConverter.java
----------------------------------------------------------------------
diff --git a/components/camel-google-drive/src/main/java/org/apache/camel/component/google/drive/GoogleDriveFilesConverter.java b/components/camel-google-drive/src/main/java/org/apache/camel/component/google/drive/GoogleDriveFilesConverter.java
index 8500377..3962fdc 100644
--- a/components/camel-google-drive/src/main/java/org/apache/camel/component/google/drive/GoogleDriveFilesConverter.java
+++ b/components/camel-google-drive/src/main/java/org/apache/camel/component/google/drive/GoogleDriveFilesConverter.java
@@ -20,19 +20,18 @@ import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
 
-import org.apache.camel.Converter;
-import org.apache.camel.Exchange;
-import org.apache.camel.RuntimeCamelException;
-import org.apache.camel.component.file.GenericFile;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import com.google.api.client.http.FileContent;
 import com.google.api.client.http.GenericUrl;
 import com.google.api.client.http.HttpResponse;
 import com.google.api.client.http.InputStreamContent;
 import com.google.api.services.drive.Drive;
 
+import org.apache.camel.Converter;
+import org.apache.camel.Exchange;
+import org.apache.camel.component.file.GenericFile;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 public final class GoogleDriveFilesConverter {
     private static final Logger LOG = LoggerFactory.getLogger(GoogleDriveFilesConverter.class);
     

http://git-wip-us.apache.org/repos/asf/camel/blob/17bb643e/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 3579453..d8b4b5c 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
@@ -19,14 +19,14 @@ package org.apache.camel.component.google.drive;
 import java.io.IOException;
 import java.util.Map;
 
+import com.google.api.client.googleapis.services.AbstractGoogleClientRequest;
+
 import org.apache.camel.RuntimeCamelException;
-import org.apache.camel.util.component.AbstractApiProducer;
-import org.apache.camel.util.component.ApiMethod;
 import org.apache.camel.component.google.drive.internal.GoogleDriveApiName;
 import org.apache.camel.component.google.drive.internal.GoogleDriveConstants;
 import org.apache.camel.component.google.drive.internal.GoogleDrivePropertiesHelper;
-
-import com.google.api.client.googleapis.services.AbstractGoogleClientRequest;
+import org.apache.camel.util.component.AbstractApiProducer;
+import org.apache.camel.util.component.ApiMethod;
 
 /**
  * The GoogleDrive producer.

http://git-wip-us.apache.org/repos/asf/camel/blob/17bb643e/components/camel-google-drive/src/main/java/org/apache/camel/component/google/drive/InteractiveGoogleDriveClientFactory.java
----------------------------------------------------------------------
diff --git a/components/camel-google-drive/src/main/java/org/apache/camel/component/google/drive/InteractiveGoogleDriveClientFactory.java b/components/camel-google-drive/src/main/java/org/apache/camel/component/google/drive/InteractiveGoogleDriveClientFactory.java
index f54f55f..cc0b44b 100644
--- a/components/camel-google-drive/src/main/java/org/apache/camel/component/google/drive/InteractiveGoogleDriveClientFactory.java
+++ b/components/camel-google-drive/src/main/java/org/apache/camel/component/google/drive/InteractiveGoogleDriveClientFactory.java
@@ -18,9 +18,6 @@ package org.apache.camel.component.google.drive;
 
 import java.util.Collection;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import com.google.api.client.auth.oauth2.Credential;
 import com.google.api.client.extensions.java6.auth.oauth2.AuthorizationCodeInstalledApp;
 import com.google.api.client.extensions.jetty.auth.oauth2.LocalServerReceiver;
@@ -30,13 +27,16 @@ import com.google.api.client.json.jackson2.JacksonFactory;
 import com.google.api.client.util.store.FileDataStoreFactory;
 import com.google.api.services.drive.Drive;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 public class InteractiveGoogleDriveClientFactory implements GoogleDriveClientFactory {
     private static final Logger LOG = LoggerFactory.getLogger(InteractiveGoogleDriveClientFactory.class);
+    private static final java.io.File DATA_STORE_DIR = new java.io.File(".google_drive");
     private NetHttpTransport transport;
     private JacksonFactory jsonFactory;
     private FileDataStoreFactory dataStoreFactory;
-    private static final java.io.File DATA_STORE_DIR = new java.io.File(".google_drive");
-
+    
     public InteractiveGoogleDriveClientFactory() {
         this.transport = new NetHttpTransport();
         this.jsonFactory = new JacksonFactory();
@@ -63,9 +63,9 @@ public class InteractiveGoogleDriveClientFactory implements GoogleDriveClientFac
         dataStoreFactory = new FileDataStoreFactory(DATA_STORE_DIR);
         // set up authorization code flow
         GoogleAuthorizationCodeFlow flow = new GoogleAuthorizationCodeFlow.Builder(transport, jsonFactory, clientId, clientSecret, scopes)
-          .setDataStoreFactory(dataStoreFactory)
-          .setAccessType("offline")
-          .build();
+            .setDataStoreFactory(dataStoreFactory)
+            .setAccessType("offline")
+            .build();
         // authorize
         return new AuthorizationCodeInstalledApp(flow, new LocalServerReceiver()).authorize("user");
     }

http://git-wip-us.apache.org/repos/asf/camel/blob/17bb643e/components/camel-google-drive/src/main/java/org/apache/camel/component/google/drive/internal/GoogleDrivePropertiesHelper.java
----------------------------------------------------------------------
diff --git a/components/camel-google-drive/src/main/java/org/apache/camel/component/google/drive/internal/GoogleDrivePropertiesHelper.java b/components/camel-google-drive/src/main/java/org/apache/camel/component/google/drive/internal/GoogleDrivePropertiesHelper.java
index 9c877d8..4493680 100644
--- a/components/camel-google-drive/src/main/java/org/apache/camel/component/google/drive/internal/GoogleDrivePropertiesHelper.java
+++ b/components/camel-google-drive/src/main/java/org/apache/camel/component/google/drive/internal/GoogleDrivePropertiesHelper.java
@@ -16,9 +16,8 @@
  */
 package org.apache.camel.component.google.drive.internal;
 
-import org.apache.camel.util.component.ApiMethodPropertiesHelper;
-
 import org.apache.camel.component.google.drive.GoogleDriveConfiguration;
+import org.apache.camel.util.component.ApiMethodPropertiesHelper;
 
 /**
  * Singleton {@link ApiMethodPropertiesHelper} for GoogleDrive component.

http://git-wip-us.apache.org/repos/asf/camel/blob/17bb643e/components/camel-google-drive/src/test/java/org/apache/camel/component/google/drive/AbstractGoogleDriveTestSupport.java
----------------------------------------------------------------------
diff --git a/components/camel-google-drive/src/test/java/org/apache/camel/component/google/drive/AbstractGoogleDriveTestSupport.java b/components/camel-google-drive/src/test/java/org/apache/camel/component/google/drive/AbstractGoogleDriveTestSupport.java
index 95a003c..067bbe6 100644
--- a/components/camel-google-drive/src/test/java/org/apache/camel/component/google/drive/AbstractGoogleDriveTestSupport.java
+++ b/components/camel-google-drive/src/test/java/org/apache/camel/component/google/drive/AbstractGoogleDriveTestSupport.java
@@ -25,33 +25,35 @@ import java.util.HashMap;
 import java.util.Map;
 import java.util.Properties;
 
+import com.google.api.client.http.FileContent;
+import com.google.api.services.drive.model.File;
+
 import org.apache.camel.CamelContext;
 import org.apache.camel.CamelExecutionException;
 import org.apache.camel.test.junit4.CamelTestSupport;
 import org.apache.camel.util.IntrospectionSupport;
 import org.junit.AfterClass;
 
-import com.google.api.client.http.FileContent;
-import com.google.api.services.drive.model.File;
-
 public abstract class AbstractGoogleDriveTestSupport extends CamelTestSupport {
 
     protected static final String CAMEL_TEST_TAG = "camel_was_here";
     protected static final String CAMEL_TEST_FILE = "CamelTestFile";
-    private static final String LINE_SEPARATOR = System.getProperty("line.separator");
-    private static final String TEST_OPTIONS_PROPERTIES = "/test-options.properties";
-    private static final String REFRESH_TOKEN_PROPERTY = "refreshToken";
     protected static String testUserId;
-
-    private static String refreshToken;
-    private static String propertyText;
-
     protected static String testFolderId;
     protected static String testFileId;
 
     protected static final String TEST_UPLOAD_FILE = "src/test/resources/log4j.properties";
     protected static final String TEST_UPLOAD_IMG = "src/test/resources/camel-box-small.png";
     protected static final java.io.File UPLOAD_FILE = new java.io.File(TEST_UPLOAD_FILE);
+
+    private static String refreshToken;
+    private static String propertyText;
+
+    
+    private static final String LINE_SEPARATOR = System.getProperty("line.separator");
+    private static final String TEST_OPTIONS_PROPERTIES = "/test-options.properties";
+    private static final String REFRESH_TOKEN_PROPERTY = "refreshToken";
+    
     
     protected File uploadTestFile() {
         File fileMetadata = new File();
@@ -88,7 +90,7 @@ public abstract class AbstractGoogleDriveTestSupport extends CamelTestSupport {
         final StringBuilder builder = new StringBuilder();
         final BufferedReader reader = new BufferedReader(new InputStreamReader(in, "UTF-8"));
         String line;
-        while((line = reader.readLine()) != null) {
+        while ((line = reader.readLine()) != null) {
             builder.append(line).append(LINE_SEPARATOR);
         }
         propertyText = builder.toString();

http://git-wip-us.apache.org/repos/asf/camel/blob/17bb643e/components/camel-google-drive/src/test/java/org/apache/camel/component/google/drive/DriveAboutIntegrationTest.java
----------------------------------------------------------------------
diff --git a/components/camel-google-drive/src/test/java/org/apache/camel/component/google/drive/DriveAboutIntegrationTest.java b/components/camel-google-drive/src/test/java/org/apache/camel/component/google/drive/DriveAboutIntegrationTest.java
index af74c75..c029d28 100644
--- a/components/camel-google-drive/src/test/java/org/apache/camel/component/google/drive/DriveAboutIntegrationTest.java
+++ b/components/camel-google-drive/src/test/java/org/apache/camel/component/google/drive/DriveAboutIntegrationTest.java
@@ -17,13 +17,12 @@
 package org.apache.camel.component.google.drive;
 
 import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.google.drive.internal.DriveAboutApiMethod;
+import org.apache.camel.component.google.drive.internal.GoogleDriveApiCollection;
 import org.junit.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import org.apache.camel.component.google.drive.internal.GoogleDriveApiCollection;
-import org.apache.camel.component.google.drive.internal.DriveAboutApiMethod;
-
 /**
  * Test class for com.google.api.services.drive.Drive$About APIs.
  */
@@ -46,7 +45,7 @@ public class DriveAboutIntegrationTest extends AbstractGoogleDriveTestSupport {
             public void configure() {
                 // test route for get
                 from("direct://GET")
-                  .to("google-drive://" + PATH_PREFIX + "/get");
+                    .to("google-drive://" + PATH_PREFIX + "/get");
 
             }
         };

http://git-wip-us.apache.org/repos/asf/camel/blob/17bb643e/components/camel-google-drive/src/test/java/org/apache/camel/component/google/drive/DriveAppsIntegrationTest.java
----------------------------------------------------------------------
diff --git a/components/camel-google-drive/src/test/java/org/apache/camel/component/google/drive/DriveAppsIntegrationTest.java b/components/camel-google-drive/src/test/java/org/apache/camel/component/google/drive/DriveAppsIntegrationTest.java
index 210c51a..b66d2b5 100644
--- a/components/camel-google-drive/src/test/java/org/apache/camel/component/google/drive/DriveAppsIntegrationTest.java
+++ b/components/camel-google-drive/src/test/java/org/apache/camel/component/google/drive/DriveAppsIntegrationTest.java
@@ -17,14 +17,13 @@
 package org.apache.camel.component.google.drive;
 
 import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.google.drive.internal.DriveAppsApiMethod;
+import org.apache.camel.component.google.drive.internal.GoogleDriveApiCollection;
 import org.junit.Ignore;
 import org.junit.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import org.apache.camel.component.google.drive.internal.GoogleDriveApiCollection;
-import org.apache.camel.component.google.drive.internal.DriveAppsApiMethod;
-
 /**
  * Test class for com.google.api.services.drive.Drive$Apps APIs.
  */
@@ -50,11 +49,11 @@ public class DriveAppsIntegrationTest extends AbstractGoogleDriveTestSupport {
             public void configure() {
                 // test route for get
                 from("direct://GET")
-                  .to("google-drive://" + PATH_PREFIX + "/get?inBody=appId");
+                    .to("google-drive://" + PATH_PREFIX + "/get?inBody=appId");
 
                 // test route for list
                 from("direct://LIST")
-                  .to("google-drive://" + PATH_PREFIX + "/list");
+                    .to("google-drive://" + PATH_PREFIX + "/list");
 
             }
         };

http://git-wip-us.apache.org/repos/asf/camel/blob/17bb643e/components/camel-google-drive/src/test/java/org/apache/camel/component/google/drive/DriveChangesIntegrationTest.java
----------------------------------------------------------------------
diff --git a/components/camel-google-drive/src/test/java/org/apache/camel/component/google/drive/DriveChangesIntegrationTest.java b/components/camel-google-drive/src/test/java/org/apache/camel/component/google/drive/DriveChangesIntegrationTest.java
index befa14c..f3e6f06 100644
--- a/components/camel-google-drive/src/test/java/org/apache/camel/component/google/drive/DriveChangesIntegrationTest.java
+++ b/components/camel-google-drive/src/test/java/org/apache/camel/component/google/drive/DriveChangesIntegrationTest.java
@@ -18,14 +18,14 @@ package org.apache.camel.component.google.drive;
 
 import java.util.List;
 
+import com.google.api.services.drive.model.Change;
+
 import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.google.drive.internal.DriveChangesApiMethod;
+import org.apache.camel.component.google.drive.internal.GoogleDriveApiCollection;
 import org.junit.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.apache.camel.component.google.drive.internal.GoogleDriveApiCollection;
-import org.apache.camel.component.google.drive.internal.DriveChangesApiMethod;
-
-import com.google.api.services.drive.model.Change;
 
 /**
  * Test class for com.google.api.services.drive.Drive$Changes APIs.
@@ -65,15 +65,15 @@ public class DriveChangesIntegrationTest extends AbstractGoogleDriveTestSupport
             public void configure() {
                 // test route for get
                 from("direct://GET")
-                  .to("google-drive://" + PATH_PREFIX + "/get?inBody=changeId");
+                    .to("google-drive://" + PATH_PREFIX + "/get?inBody=changeId");
 
                 // test route for list
                 from("direct://LIST")
-                  .to("google-drive://" + PATH_PREFIX + "/list");
+                    .to("google-drive://" + PATH_PREFIX + "/list");
 
                 // test route for watch
                 from("direct://WATCH")
-                  .to("google-drive://" + PATH_PREFIX + "/watch?inBody=contentChannel");
+                    .to("google-drive://" + PATH_PREFIX + "/watch?inBody=contentChannel");
 
             }
         };

http://git-wip-us.apache.org/repos/asf/camel/blob/17bb643e/components/camel-google-drive/src/test/java/org/apache/camel/component/google/drive/DriveChildrenIntegrationTest.java
----------------------------------------------------------------------
diff --git a/components/camel-google-drive/src/test/java/org/apache/camel/component/google/drive/DriveChildrenIntegrationTest.java b/components/camel-google-drive/src/test/java/org/apache/camel/component/google/drive/DriveChildrenIntegrationTest.java
index 9f277be..8a18a98 100644
--- a/components/camel-google-drive/src/test/java/org/apache/camel/component/google/drive/DriveChildrenIntegrationTest.java
+++ b/components/camel-google-drive/src/test/java/org/apache/camel/component/google/drive/DriveChildrenIntegrationTest.java
@@ -19,15 +19,14 @@ package org.apache.camel.component.google.drive;
 import java.util.HashMap;
 import java.util.Map;
 
+import com.google.api.services.drive.model.File;
+
 import org.apache.camel.builder.RouteBuilder;
-import org.junit.Ignore;
+import org.apache.camel.component.google.drive.internal.DriveChildrenApiMethod;
+import org.apache.camel.component.google.drive.internal.GoogleDriveApiCollection;
 import org.junit.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.apache.camel.component.google.drive.internal.GoogleDriveApiCollection;
-import org.apache.camel.component.google.drive.internal.DriveChildrenApiMethod;
-
-import com.google.api.services.drive.model.File;
 
 /**
  * Test class for {@link com.google.api.services.drive.Drive$Children} APIs.
@@ -64,19 +63,19 @@ public class DriveChildrenIntegrationTest extends AbstractGoogleDriveTestSupport
             public void configure() {
                 // test route for delete
                 from("direct://DELETE")
-                  .to("google-drive://" + PATH_PREFIX + "/delete");
+                    .to("google-drive://" + PATH_PREFIX + "/delete");
 
                 // test route for get
                 from("direct://GET")
-                  .to("google-drive://" + PATH_PREFIX + "/get");
+                    .to("google-drive://" + PATH_PREFIX + "/get");
 
                 // test route for insert
                 from("direct://INSERT")
-                  .to("google-drive://" + PATH_PREFIX + "/insert");
+                    .to("google-drive://" + PATH_PREFIX + "/insert");
 
                 // test route for list
                 from("direct://LIST")
-                  .to("google-drive://" + PATH_PREFIX + "/list?inBody=folderId");
+                    .to("google-drive://" + PATH_PREFIX + "/list?inBody=folderId");
 
             }
         };

http://git-wip-us.apache.org/repos/asf/camel/blob/17bb643e/components/camel-google-drive/src/test/java/org/apache/camel/component/google/drive/DriveCommentsIntegrationTest.java
----------------------------------------------------------------------
diff --git a/components/camel-google-drive/src/test/java/org/apache/camel/component/google/drive/DriveCommentsIntegrationTest.java b/components/camel-google-drive/src/test/java/org/apache/camel/component/google/drive/DriveCommentsIntegrationTest.java
index f2b0c34..ea983ac 100644
--- a/components/camel-google-drive/src/test/java/org/apache/camel/component/google/drive/DriveCommentsIntegrationTest.java
+++ b/components/camel-google-drive/src/test/java/org/apache/camel/component/google/drive/DriveCommentsIntegrationTest.java
@@ -19,16 +19,16 @@ package org.apache.camel.component.google.drive;
 import java.util.HashMap;
 import java.util.Map;
 
+import com.google.api.services.drive.model.Comment;
+import com.google.api.services.drive.model.File;
+
 import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.google.drive.internal.DriveCommentsApiMethod;
+import org.apache.camel.component.google.drive.internal.DriveFilesApiMethod;
+import org.apache.camel.component.google.drive.internal.GoogleDriveApiCollection;
 import org.junit.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.apache.camel.component.google.drive.internal.DriveFilesApiMethod;
-import org.apache.camel.component.google.drive.internal.GoogleDriveApiCollection;
-import org.apache.camel.component.google.drive.internal.DriveCommentsApiMethod;
-
-import com.google.api.services.drive.model.Comment;
-import com.google.api.services.drive.model.File;
 
 /**
  * Test class for com.google.api.services.drive.Drive$Comments APIs.
@@ -107,31 +107,31 @@ public class DriveCommentsIntegrationTest extends AbstractGoogleDriveTestSupport
             public void configure() {
                 // test route for delete
                 from("direct://DELETE")
-                  .to("google-drive://" + PATH_PREFIX + "/delete");
+                    .to("google-drive://" + PATH_PREFIX + "/delete");
 
                 // test route for get
                 from("direct://GET")
-                  .to("google-drive://" + PATH_PREFIX + "/get");
+                    .to("google-drive://" + PATH_PREFIX + "/get");
 
                 // test route for insert
                 from("direct://INSERT")
-                  .to("google-drive://" + PATH_PREFIX + "/insert");
+                    .to("google-drive://" + PATH_PREFIX + "/insert");
 
                 // test route for list
                 from("direct://LIST")
-                  .to("google-drive://" + PATH_PREFIX + "/list?inBody=fileId");
+                    .to("google-drive://" + PATH_PREFIX + "/list?inBody=fileId");
 
                 // test route for patch
                 from("direct://PATCH")
-                  .to("google-drive://" + PATH_PREFIX + "/patch");
+                    .to("google-drive://" + PATH_PREFIX + "/patch");
 
                 // test route for update
                 from("direct://UPDATE")
-                  .to("google-drive://" + PATH_PREFIX + "/update");
+                    .to("google-drive://" + PATH_PREFIX + "/update");
                 
                 // just used to upload file for test
                 from("direct://INSERT_1")
-                  .to("google-drive://" + GoogleDriveApiCollection.getCollection().getApiName(DriveFilesApiMethod.class).getName() + "/insert");
+                    .to("google-drive://" + GoogleDriveApiCollection.getCollection().getApiName(DriveFilesApiMethod.class).getName() + "/insert");
 
             }
         };

http://git-wip-us.apache.org/repos/asf/camel/blob/17bb643e/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 bf5c216..bc15ec4 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
@@ -19,18 +19,18 @@ package org.apache.camel.component.google.drive;
 import java.util.HashMap;
 import java.util.Map;
 
+import com.google.api.client.http.FileContent;
+import com.google.api.client.util.DateTime;
+import com.google.api.services.drive.model.File;
+import com.google.api.services.drive.model.FileList;
+
 import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.google.drive.internal.DriveFilesApiMethod;
+import org.apache.camel.component.google.drive.internal.GoogleDriveApiCollection;
 import org.junit.Ignore;
 import org.junit.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.apache.camel.component.google.drive.internal.GoogleDriveApiCollection;
-import org.apache.camel.component.google.drive.internal.DriveFilesApiMethod;
-
-import com.google.api.client.http.FileContent;
-import com.google.api.client.util.DateTime;
-import com.google.api.services.drive.model.File;
-import com.google.api.services.drive.model.FileList;
 
 /**
  * Test class for com.google.api.services.drive.Drive$Files APIs.
@@ -101,7 +101,7 @@ public class DriveFilesIntegrationTest extends AbstractGoogleDriveTestSupport {
     }
 
     @Test
-    public void testInsert_1() throws Exception {        
+    public void testInsert1() throws Exception {        
         File result = uploadTestFile();
 
         assertNotNull("insert result", result);
@@ -183,7 +183,7 @@ public class DriveFilesIntegrationTest extends AbstractGoogleDriveTestSupport {
     }
 
     @Test
-    public void testUpdate_1() throws Exception {       
+    public void testUpdate1() throws Exception {       
         
         // First retrieve the file from the API.
         File testFile = uploadTestFile();
@@ -237,55 +237,55 @@ public class DriveFilesIntegrationTest extends AbstractGoogleDriveTestSupport {
             public void configure() {
                 // test route for copy
                 from("direct://COPY")
-                  .to("google-drive://" + PATH_PREFIX + "/copy");
+                    .to("google-drive://" + PATH_PREFIX + "/copy");
 
                 // test route for delete
                 from("direct://DELETE")
-                  .to("google-drive://" + PATH_PREFIX + "/delete?inBody=fileId");
+                    .to("google-drive://" + PATH_PREFIX + "/delete?inBody=fileId");
 
                 // test route for get
                 from("direct://GET")
-                  .to("google-drive://" + PATH_PREFIX + "/get?inBody=fileId");
+                    .to("google-drive://" + PATH_PREFIX + "/get?inBody=fileId");
 
                 // test route for insert
                 from("direct://INSERT")
-                  .to("google-drive://" + PATH_PREFIX + "/insert?inBody=content");
+                    .to("google-drive://" + PATH_PREFIX + "/insert?inBody=content");
 
                 // test route for insert
                 from("direct://INSERT_1")
-                  .to("google-drive://" + PATH_PREFIX + "/insert");
+                    .to("google-drive://" + PATH_PREFIX + "/insert");
 
                 // test route for list
                 from("direct://LIST")
-                  .to("google-drive://" + PATH_PREFIX + "/list");
+                    .to("google-drive://" + PATH_PREFIX + "/list");
 
                 // test route for patch
                 from("direct://PATCH")
-                  .to("google-drive://" + PATH_PREFIX + "/patch");
+                    .to("google-drive://" + PATH_PREFIX + "/patch");
 
                 // test route for touch
                 from("direct://TOUCH")
-                  .to("google-drive://" + PATH_PREFIX + "/touch?inBody=fileId");
+                    .to("google-drive://" + PATH_PREFIX + "/touch?inBody=fileId");
 
                 // test route for trash
                 from("direct://TRASH")
-                  .to("google-drive://" + PATH_PREFIX + "/trash?inBody=fileId");
+                    .to("google-drive://" + PATH_PREFIX + "/trash?inBody=fileId");
 
                 // test route for untrash
                 from("direct://UNTRASH")
-                  .to("google-drive://" + PATH_PREFIX + "/untrash?inBody=fileId");
+                    .to("google-drive://" + PATH_PREFIX + "/untrash?inBody=fileId");
 
                 // test route for update
                 from("direct://UPDATE")
-                  .to("google-drive://" + PATH_PREFIX + "/update");
+                    .to("google-drive://" + PATH_PREFIX + "/update");
 
                 // test route for update
                 from("direct://UPDATE_1")
-                  .to("google-drive://" + PATH_PREFIX + "/update");
+                    .to("google-drive://" + PATH_PREFIX + "/update");
 
                 // test route for watch
                 from("direct://WATCH")
-                  .to("google-drive://" + PATH_PREFIX + "/watch");
+                    .to("google-drive://" + PATH_PREFIX + "/watch");
 
             }
         };

http://git-wip-us.apache.org/repos/asf/camel/blob/17bb643e/components/camel-google-drive/src/test/java/org/apache/camel/component/google/drive/DrivePermissionsIntegrationTest.java
----------------------------------------------------------------------
diff --git a/components/camel-google-drive/src/test/java/org/apache/camel/component/google/drive/DrivePermissionsIntegrationTest.java b/components/camel-google-drive/src/test/java/org/apache/camel/component/google/drive/DrivePermissionsIntegrationTest.java
index 0d08ace..dbc2718 100644
--- a/components/camel-google-drive/src/test/java/org/apache/camel/component/google/drive/DrivePermissionsIntegrationTest.java
+++ b/components/camel-google-drive/src/test/java/org/apache/camel/component/google/drive/DrivePermissionsIntegrationTest.java
@@ -16,14 +16,13 @@
  */
 package org.apache.camel.component.google.drive;
 
+import com.google.api.services.drive.model.File;
 import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.google.drive.internal.DrivePermissionsApiMethod;
+import org.apache.camel.component.google.drive.internal.GoogleDriveApiCollection;
 import org.junit.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.apache.camel.component.google.drive.internal.GoogleDriveApiCollection;
-import org.apache.camel.component.google.drive.internal.DrivePermissionsApiMethod;
-
-import com.google.api.services.drive.model.File;
 
 /**
  * Test class for com.google.api.services.drive.Drive$Permissions APIs.
@@ -51,35 +50,35 @@ public class DrivePermissionsIntegrationTest extends AbstractGoogleDriveTestSupp
             public void configure() {
                 // test route for delete
                 from("direct://DELETE")
-                  .to("google-drive://" + PATH_PREFIX + "/delete");
+                    .to("google-drive://" + PATH_PREFIX + "/delete");
 
                 // test route for get
                 from("direct://GET")
-                  .to("google-drive://" + PATH_PREFIX + "/get");
+                    .to("google-drive://" + PATH_PREFIX + "/get");
 
                 // test route for getIdForEmail
                 from("direct://GETIDFOREMAIL")
-                  .to("google-drive://" + PATH_PREFIX + "/getIdForEmail?inBody=email");
+                    .to("google-drive://" + PATH_PREFIX + "/getIdForEmail?inBody=email");
 
                 // test route for insert
                 from("direct://INSERT")
-                  .to("google-drive://" + PATH_PREFIX + "/insert");
+                    .to("google-drive://" + PATH_PREFIX + "/insert");
 
                 // test route for list
                 from("direct://LIST")
-                  .to("google-drive://" + PATH_PREFIX + "/list?inBody=fileId");
+                    .to("google-drive://" + PATH_PREFIX + "/list?inBody=fileId");
 
                 // test route for patch
                 from("direct://PATCH")
-                  .to("google-drive://" + PATH_PREFIX + "/patch");
+                    .to("google-drive://" + PATH_PREFIX + "/patch");
 
                 // test route for update
                 from("direct://UPDATE")
-                  .to("google-drive://" + PATH_PREFIX + "/update");
+                    .to("google-drive://" + PATH_PREFIX + "/update");
                 
                 // just used to upload file for test
                 from("direct://INSERT_1")
-                  .to("google-drive://drive-files/insert");
+                    .to("google-drive://drive-files/insert");
 
             }
         };

http://git-wip-us.apache.org/repos/asf/camel/blob/17bb643e/components/camel-google-drive/src/test/java/org/apache/camel/component/google/drive/DrivePropertiesIntegrationTest.java
----------------------------------------------------------------------
diff --git a/components/camel-google-drive/src/test/java/org/apache/camel/component/google/drive/DrivePropertiesIntegrationTest.java b/components/camel-google-drive/src/test/java/org/apache/camel/component/google/drive/DrivePropertiesIntegrationTest.java
index a1e066c..af64c48 100644
--- a/components/camel-google-drive/src/test/java/org/apache/camel/component/google/drive/DrivePropertiesIntegrationTest.java
+++ b/components/camel-google-drive/src/test/java/org/apache/camel/component/google/drive/DrivePropertiesIntegrationTest.java
@@ -16,14 +16,13 @@
  */
 package org.apache.camel.component.google.drive;
 
+import com.google.api.services.drive.model.File;
 import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.google.drive.internal.DrivePropertiesApiMethod;
+import org.apache.camel.component.google.drive.internal.GoogleDriveApiCollection;
 import org.junit.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.apache.camel.component.google.drive.internal.GoogleDriveApiCollection;
-import org.apache.camel.component.google.drive.internal.DrivePropertiesApiMethod;
-
-import com.google.api.services.drive.model.File;
 
 /**
  * Test class for com.google.api.services.drive.Drive$Properties APIs.
@@ -52,31 +51,31 @@ public class DrivePropertiesIntegrationTest extends AbstractGoogleDriveTestSuppo
             public void configure() {
                 // test route for delete
                 from("direct://DELETE")
-                  .to("google-drive://" + PATH_PREFIX + "/delete");
+                    .to("google-drive://" + PATH_PREFIX + "/delete");
 
                 // test route for get
                 from("direct://GET")
-                  .to("google-drive://" + PATH_PREFIX + "/get");
+                    .to("google-drive://" + PATH_PREFIX + "/get");
 
                 // test route for insert
                 from("direct://INSERT")
-                  .to("google-drive://" + PATH_PREFIX + "/insert");
+                    .to("google-drive://" + PATH_PREFIX + "/insert");
 
                 // test route for list
                 from("direct://LIST")
-                  .to("google-drive://" + PATH_PREFIX + "/list?inBody=fileId");
+                    .to("google-drive://" + PATH_PREFIX + "/list?inBody=fileId");
 
                 // test route for patch
                 from("direct://PATCH")
-                  .to("google-drive://" + PATH_PREFIX + "/patch");
+                    .to("google-drive://" + PATH_PREFIX + "/patch");
 
                 // test route for update
                 from("direct://UPDATE")
-                  .to("google-drive://" + PATH_PREFIX + "/update");
+                    .to("google-drive://" + PATH_PREFIX + "/update");
                 
                 // just used to upload file for test
                 from("direct://INSERT_1")
-                  .to("google-drive://drive-files/insert");
+                    .to("google-drive://drive-files/insert");
             }
         };
     }

http://git-wip-us.apache.org/repos/asf/camel/blob/17bb643e/components/camel-google-drive/src/test/java/org/apache/camel/component/google/drive/DriveRepliesIntegrationTest.java
----------------------------------------------------------------------
diff --git a/components/camel-google-drive/src/test/java/org/apache/camel/component/google/drive/DriveRepliesIntegrationTest.java b/components/camel-google-drive/src/test/java/org/apache/camel/component/google/drive/DriveRepliesIntegrationTest.java
index 76cee35..c1bbaa2 100644
--- a/components/camel-google-drive/src/test/java/org/apache/camel/component/google/drive/DriveRepliesIntegrationTest.java
+++ b/components/camel-google-drive/src/test/java/org/apache/camel/component/google/drive/DriveRepliesIntegrationTest.java
@@ -19,16 +19,16 @@ package org.apache.camel.component.google.drive;
 import java.util.HashMap;
 import java.util.Map;
 
+import com.google.api.services.drive.model.Comment;
+import com.google.api.services.drive.model.File;
+
 import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.google.drive.internal.DriveFilesApiMethod;
+import org.apache.camel.component.google.drive.internal.DriveRepliesApiMethod;
+import org.apache.camel.component.google.drive.internal.GoogleDriveApiCollection;
 import org.junit.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.apache.camel.component.google.drive.internal.DriveFilesApiMethod;
-import org.apache.camel.component.google.drive.internal.GoogleDriveApiCollection;
-import org.apache.camel.component.google.drive.internal.DriveRepliesApiMethod;
-
-import com.google.api.services.drive.model.Comment;
-import com.google.api.services.drive.model.File;
 
 /**
  * Test class for com.google.api.services.drive.Drive$Replies APIs.
@@ -99,39 +99,39 @@ public class DriveRepliesIntegrationTest extends AbstractGoogleDriveTestSupport
             public void configure() {
                 // test route for delete
                 from("direct://DELETE")
-                  .to("google-drive://" + PATH_PREFIX + "/delete");
+                    .to("google-drive://" + PATH_PREFIX + "/delete");
 
                 // test route for get
                 from("direct://GET")
-                  .to("google-drive://" + PATH_PREFIX + "/get");
+                    .to("google-drive://" + PATH_PREFIX + "/get");
 
                 // test route for insert
                 from("direct://INSERT")
-                  .to("google-drive://" + PATH_PREFIX + "/insert");
+                    .to("google-drive://" + PATH_PREFIX + "/insert");
 
                 // test route for list
                 from("direct://LIST")
-                  .to("google-drive://" + PATH_PREFIX + "/list");
+                    .to("google-drive://" + PATH_PREFIX + "/list");
 
                 // test route for patch
                 from("direct://PATCH")
-                  .to("google-drive://" + PATH_PREFIX + "/patch");
+                    .to("google-drive://" + PATH_PREFIX + "/patch");
 
                 // test route for update
                 from("direct://UPDATE")
-                  .to("google-drive://" + PATH_PREFIX + "/update");
+                    .to("google-drive://" + PATH_PREFIX + "/update");
                 
                 // just used to upload file for test
                 from("direct://INSERT_1")
-                  .to("google-drive://" + GoogleDriveApiCollection.getCollection().getApiName(DriveFilesApiMethod.class).getName() + "/insert");
+                    .to("google-drive://" + GoogleDriveApiCollection.getCollection().getApiName(DriveFilesApiMethod.class).getName() + "/insert");
                 
                 // test route for insert
                 from("direct://INSERT_COMMENT")
-                  .to("google-drive://drive-comments/insert");
+                    .to("google-drive://drive-comments/insert");
 
                 // test route for list
                 from("direct://LIST_COMMENTS")
-                  .to("google-drive://drive-comments/list?inBody=fileId");
+                    .to("google-drive://drive-comments/list?inBody=fileId");
 
             }
         };

http://git-wip-us.apache.org/repos/asf/camel/blob/17bb643e/components/camel-google-drive/src/test/java/org/apache/camel/component/google/drive/DriveRevisionsIntegrationTest.java
----------------------------------------------------------------------
diff --git a/components/camel-google-drive/src/test/java/org/apache/camel/component/google/drive/DriveRevisionsIntegrationTest.java b/components/camel-google-drive/src/test/java/org/apache/camel/component/google/drive/DriveRevisionsIntegrationTest.java
index 22ab865..7360714 100644
--- a/components/camel-google-drive/src/test/java/org/apache/camel/component/google/drive/DriveRevisionsIntegrationTest.java
+++ b/components/camel-google-drive/src/test/java/org/apache/camel/component/google/drive/DriveRevisionsIntegrationTest.java
@@ -16,14 +16,13 @@
  */
 package org.apache.camel.component.google.drive;
 
+import com.google.api.services.drive.model.File;
 import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.google.drive.internal.DriveRevisionsApiMethod;
+import org.apache.camel.component.google.drive.internal.GoogleDriveApiCollection;
 import org.junit.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.apache.camel.component.google.drive.internal.GoogleDriveApiCollection;
-import org.apache.camel.component.google.drive.internal.DriveRevisionsApiMethod;
-
-import com.google.api.services.drive.model.File;
 
 /**
  * Test class for com.google.api.services.drive.Drive$Revisions APIs.
@@ -51,27 +50,27 @@ public class DriveRevisionsIntegrationTest extends AbstractGoogleDriveTestSuppor
             public void configure() {
                 // test route for delete
                 from("direct://DELETE")
-                  .to("google-drive://" + PATH_PREFIX + "/delete");
+                    .to("google-drive://" + PATH_PREFIX + "/delete");
 
                 // test route for get
                 from("direct://GET")
-                  .to("google-drive://" + PATH_PREFIX + "/get");
+                    .to("google-drive://" + PATH_PREFIX + "/get");
 
                 // test route for list
                 from("direct://LIST")
-                  .to("google-drive://" + PATH_PREFIX + "/list?inBody=fileId");
+                    .to("google-drive://" + PATH_PREFIX + "/list?inBody=fileId");
 
                 // test route for patch
                 from("direct://PATCH")
-                  .to("google-drive://" + PATH_PREFIX + "/patch");
+                    .to("google-drive://" + PATH_PREFIX + "/patch");
 
                 // test route for update
                 from("direct://UPDATE")
-                  .to("google-drive://" + PATH_PREFIX + "/update");
+                    .to("google-drive://" + PATH_PREFIX + "/update");
 
                 // just used to upload file for test
                 from("direct://INSERT_1")
-                  .to("google-drive://drive-files/insert");
+                    .to("google-drive://drive-files/insert");
             }
         };
     }

http://git-wip-us.apache.org/repos/asf/camel/blob/17bb643e/components/camel-google-drive/src/test/java/org/apache/camel/component/google/drive/FileConverterIntegrationTest.java
----------------------------------------------------------------------
diff --git a/components/camel-google-drive/src/test/java/org/apache/camel/component/google/drive/FileConverterIntegrationTest.java b/components/camel-google-drive/src/test/java/org/apache/camel/component/google/drive/FileConverterIntegrationTest.java
index 0e7d406..f9453c6 100644
--- a/components/camel-google-drive/src/test/java/org/apache/camel/component/google/drive/FileConverterIntegrationTest.java
+++ b/components/camel-google-drive/src/test/java/org/apache/camel/component/google/drive/FileConverterIntegrationTest.java
@@ -17,18 +17,14 @@
 package org.apache.camel.component.google.drive;
 
 
-import java.io.InputStream;
-
+import com.google.api.services.drive.model.File;
 import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.google.drive.internal.DriveFilesApiMethod;
+import org.apache.camel.component.google.drive.internal.GoogleDriveApiCollection;
+import org.apache.camel.component.mock.MockEndpoint;
 import org.junit.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.apache.camel.component.google.drive.internal.GoogleDriveApiCollection;
-import org.apache.camel.component.google.drive.internal.DriveFilesApiMethod;
-import org.apache.camel.component.mock.MockEndpoint;
-
-import com.google.api.services.drive.model.File;
-import com.google.api.services.drive.model.FileList;
 
 /**
  * Test class for com.google.api.services.drive.Drive$Files APIs.
@@ -64,9 +60,9 @@ public class FileConverterIntegrationTest extends AbstractGoogleDriveTestSupport
         return new RouteBuilder() {
             public void configure() {
                 from("file://target/convertertest?noop=true")
-                  .convertBodyTo(File.class)
-                  .to("google-drive://drive-files/insert?inBody=content")
-                  .to("mock:result");
+                    .convertBodyTo(File.class)
+                    .to("google-drive://drive-files/insert?inBody=content")
+                    .to("mock:result");
             }
         };
     }

http://git-wip-us.apache.org/repos/asf/camel/blob/17bb643e/components/camel-google-drive/src/test/java/org/apache/camel/component/google/drive/FilesConsumerIntegrationTest.java
----------------------------------------------------------------------
diff --git a/components/camel-google-drive/src/test/java/org/apache/camel/component/google/drive/FilesConsumerIntegrationTest.java b/components/camel-google-drive/src/test/java/org/apache/camel/component/google/drive/FilesConsumerIntegrationTest.java
index 55dd5f4..67e0ee6 100644
--- a/components/camel-google-drive/src/test/java/org/apache/camel/component/google/drive/FilesConsumerIntegrationTest.java
+++ b/components/camel-google-drive/src/test/java/org/apache/camel/component/google/drive/FilesConsumerIntegrationTest.java
@@ -17,16 +17,15 @@
 package org.apache.camel.component.google.drive;
 
 
+import com.google.api.services.drive.model.File;
+import com.google.api.services.drive.model.FileList;
 import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.google.drive.internal.DriveFilesApiMethod;
+import org.apache.camel.component.google.drive.internal.GoogleDriveApiCollection;
+import org.apache.camel.component.mock.MockEndpoint;
 import org.junit.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.apache.camel.component.google.drive.internal.GoogleDriveApiCollection;
-import org.apache.camel.component.google.drive.internal.DriveFilesApiMethod;
-import org.apache.camel.component.mock.MockEndpoint;
-
-import com.google.api.services.drive.model.File;
-import com.google.api.services.drive.model.FileList;
 
 /**
  * Test class for com.google.api.services.drive.Drive$Files APIs.