Repository: camel Updated Branches: refs/heads/master 7ffb70e2b -> 4b45630f6
Fix CS Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/38c0a977 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/38c0a977 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/38c0a977 Branch: refs/heads/master Commit: 38c0a97777f256708cce50b68937c24d33c5e5db Parents: 3c6769d Author: Jonathan Anstey <jans...@gmail.com> Authored: Tue Dec 2 17:16:36 2014 -0330 Committer: Jonathan Anstey <jans...@gmail.com> Committed: Tue Dec 2 17:16:54 2014 -0330 ---------------------------------------------------------------------- .../mail/BatchGoogleMailClientFactory.java | 12 +-- .../google/mail/GoogleMailComponent.java | 18 ++--- .../google/mail/GoogleMailConfiguration.java | 10 +-- .../google/mail/GoogleMailConsumer.java | 8 +- .../google/mail/GoogleMailEndpoint.java | 62 +++++++-------- .../google/mail/GoogleMailProducer.java | 5 +- .../mail/AbstractGoogleMailTestSupport.java | 17 ++--- .../google/mail/GmailUsersIntegrationTest.java | 11 +-- .../mail/GmailUsersLabelsIntegrationTest.java | 27 +++---- .../mail/GmailUsersMessagesIntegrationTest.java | 80 ++++++++------------ .../mail/GmailUsersThreadsIntegrationTest.java | 56 ++++++-------- parent/pom.xml | 1 + 12 files changed, 128 insertions(+), 179 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/38c0a977/components/camel-google-mail/src/main/java/org/apache/camel/component/google/mail/BatchGoogleMailClientFactory.java ---------------------------------------------------------------------- diff --git a/components/camel-google-mail/src/main/java/org/apache/camel/component/google/mail/BatchGoogleMailClientFactory.java b/components/camel-google-mail/src/main/java/org/apache/camel/component/google/mail/BatchGoogleMailClientFactory.java index 626d232..ea6b085 100644 --- a/components/camel-google-mail/src/main/java/org/apache/camel/component/google/mail/BatchGoogleMailClientFactory.java +++ b/components/camel-google-mail/src/main/java/org/apache/camel/component/google/mail/BatchGoogleMailClientFactory.java @@ -45,24 +45,20 @@ public class BatchGoogleMailClientFactory implements GoogleMailClientFactory { if (refreshToken != null && !"".equals(refreshToken)) { credential.setRefreshToken(refreshToken); - } + } if (accessToken != null && !"".equals(accessToken)) { credential.setAccessToken(accessToken); } return new Gmail.Builder(transport, jsonFactory, credential).setApplicationName(applicationName).build(); } catch (Exception e) { - LOG.error("Could not create Google Drive client.", e); + LOG.error("Could not create Google Drive client.", e); } return null; } - + // Authorizes the installed application to access user's protected data. private Credential authorize(String clientId, String clientSecret, Collection<String> scopes) throws Exception { // authorize - return new GoogleCredential.Builder() - .setJsonFactory(jsonFactory) - .setTransport(transport) - .setClientSecrets(clientId, clientSecret) - .build(); + return new GoogleCredential.Builder().setJsonFactory(jsonFactory).setTransport(transport).setClientSecrets(clientId, clientSecret).build(); } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/camel/blob/38c0a977/components/camel-google-mail/src/main/java/org/apache/camel/component/google/mail/GoogleMailComponent.java ---------------------------------------------------------------------- diff --git a/components/camel-google-mail/src/main/java/org/apache/camel/component/google/mail/GoogleMailComponent.java b/components/camel-google-mail/src/main/java/org/apache/camel/component/google/mail/GoogleMailComponent.java index 4d88110..b19d485 100644 --- a/components/camel-google-mail/src/main/java/org/apache/camel/component/google/mail/GoogleMailComponent.java +++ b/components/camel-google-mail/src/main/java/org/apache/camel/component/google/mail/GoogleMailComponent.java @@ -16,15 +16,12 @@ */ package org.apache.camel.component.google.mail; - import com.google.api.services.gmail.Gmail; 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.mail.internal.GoogleMailApiCollection; -import org.apache.camel.component.google.mail.internal.GoogleMailApiName; /** * Represents the component that manages {@link GoogleMailEndpoint}. @@ -34,7 +31,7 @@ public class GoogleMailComponent extends AbstractApiComponent<GoogleMailApiName, private Gmail client; private GoogleMailClientFactory clientFactory; - + public GoogleMailComponent() { super(GoogleMailEndpoint.class, GoogleMailApiName.class, GoogleMailApiCollection.getCollection()); } @@ -50,26 +47,25 @@ public class GoogleMailComponent extends AbstractApiComponent<GoogleMailApiName, public Gmail getClient() { if (client == null) { - client = getClientFactory().makeClient(configuration.getClientId(), configuration.getClientSecret(), configuration.getScopes(), - configuration.getApplicationName(), configuration.getRefreshToken(), configuration.getAccessToken()); + client = getClientFactory().makeClient(configuration.getClientId(), configuration.getClientSecret(), configuration.getScopes(), configuration.getApplicationName(), + configuration.getRefreshToken(), configuration.getAccessToken()); } return client; } - + public GoogleMailClientFactory getClientFactory() { if (clientFactory == null) { clientFactory = new BatchGoogleMailClientFactory(); } return clientFactory; } - + public void setClientFactory(GoogleMailClientFactory clientFactory) { this.clientFactory = clientFactory; } - + @Override - protected Endpoint createEndpoint(String uri, String methodName, GoogleMailApiName apiName, - GoogleMailConfiguration endpointConfiguration) { + protected Endpoint createEndpoint(String uri, String methodName, GoogleMailApiName apiName, GoogleMailConfiguration endpointConfiguration) { return new GoogleMailEndpoint(uri, this, apiName, methodName, endpointConfiguration); } } http://git-wip-us.apache.org/repos/asf/camel/blob/38c0a977/components/camel-google-mail/src/main/java/org/apache/camel/component/google/mail/GoogleMailConfiguration.java ---------------------------------------------------------------------- diff --git a/components/camel-google-mail/src/main/java/org/apache/camel/component/google/mail/GoogleMailConfiguration.java b/components/camel-google-mail/src/main/java/org/apache/camel/component/google/mail/GoogleMailConfiguration.java index 66786a7..1b9417e 100644 --- a/components/camel-google-mail/src/main/java/org/apache/camel/component/google/mail/GoogleMailConfiguration.java +++ b/components/camel-google-mail/src/main/java/org/apache/camel/component/google/mail/GoogleMailConfiguration.java @@ -29,11 +29,11 @@ import org.apache.camel.spi.UriParams; */ @UriParams public class GoogleMailConfiguration { - private static final List<String> DEFAULT_SCOPES = Arrays.asList(GmailScopes.GMAIL_COMPOSE, GmailScopes.GMAIL_MODIFY, GmailScopes.MAIL_GOOGLE_COM); - + private static final List<String> DEFAULT_SCOPES = Arrays.asList(GmailScopes.GMAIL_COMPOSE, GmailScopes.GMAIL_MODIFY, GmailScopes.MAIL_GOOGLE_COM); + @UriParam private List<String> scopes = DEFAULT_SCOPES; - + @UriParam private String clientId; @@ -48,7 +48,7 @@ public class GoogleMailConfiguration { @UriParam private String applicationName; - + public String getClientId() { return clientId; } @@ -88,7 +88,7 @@ public class GoogleMailConfiguration { public void setApplicationName(String applicationName) { this.applicationName = applicationName; } - + public List<String> getScopes() { return scopes; } http://git-wip-us.apache.org/repos/asf/camel/blob/38c0a977/components/camel-google-mail/src/main/java/org/apache/camel/component/google/mail/GoogleMailConsumer.java ---------------------------------------------------------------------- diff --git a/components/camel-google-mail/src/main/java/org/apache/camel/component/google/mail/GoogleMailConsumer.java b/components/camel-google-mail/src/main/java/org/apache/camel/component/google/mail/GoogleMailConsumer.java index 65dbc84..d2075c2 100644 --- a/components/camel-google-mail/src/main/java/org/apache/camel/component/google/mail/GoogleMailConsumer.java +++ b/components/camel-google-mail/src/main/java/org/apache/camel/component/google/mail/GoogleMailConsumer.java @@ -16,7 +16,6 @@ */ package org.apache.camel.component.google.mail; -import java.io.IOException; import java.util.Map; import com.google.api.client.googleapis.services.AbstractGoogleClientRequest; @@ -25,7 +24,6 @@ import org.apache.camel.Processor; import org.apache.camel.RuntimeCamelException; import org.apache.camel.util.IntrospectionSupport; import org.apache.camel.util.component.AbstractApiConsumer; -import org.apache.camel.component.google.mail.internal.GoogleMailApiName; /** * The GoogleMail consumer. @@ -35,7 +33,7 @@ public class GoogleMailConsumer extends AbstractApiConsumer<GoogleMailApiName, G public GoogleMailConsumer(GoogleMailEndpoint endpoint, Processor processor) { super(endpoint, processor); } - + @Override protected Object doInvokeMethod(Map<String, Object> properties) throws RuntimeCamelException { AbstractGoogleClientRequest request = (AbstractGoogleClientRequest) super.doInvokeMethod(properties); @@ -43,13 +41,13 @@ public class GoogleMailConsumer extends AbstractApiConsumer<GoogleMailApiName, G setProperty(properties, request, "q"); setProperty(properties, request, "maxResults"); setProperty(properties, request, "pageToken"); - setProperty(properties, request, "format"); + setProperty(properties, request, "format"); return request.execute(); } catch (Exception e) { throw new RuntimeCamelException(e); } } - + private void setProperty(Map<String, Object> properties, AbstractGoogleClientRequest request, String key) throws Exception { if (properties.containsKey(key)) { IntrospectionSupport.setProperty(getEndpoint().getCamelContext().getTypeConverter(), request, key, properties.get(key)); http://git-wip-us.apache.org/repos/asf/camel/blob/38c0a977/components/camel-google-mail/src/main/java/org/apache/camel/component/google/mail/GoogleMailEndpoint.java ---------------------------------------------------------------------- diff --git a/components/camel-google-mail/src/main/java/org/apache/camel/component/google/mail/GoogleMailEndpoint.java b/components/camel-google-mail/src/main/java/org/apache/camel/component/google/mail/GoogleMailEndpoint.java index 516ce1b..92cd969 100644 --- a/components/camel-google-mail/src/main/java/org/apache/camel/component/google/mail/GoogleMailEndpoint.java +++ b/components/camel-google-mail/src/main/java/org/apache/camel/component/google/mail/GoogleMailEndpoint.java @@ -23,14 +23,12 @@ import com.google.api.services.gmail.Gmail; import org.apache.camel.Consumer; import org.apache.camel.Processor; import org.apache.camel.Producer; +import org.apache.camel.component.google.mail.internal.GoogleMailConstants; +import org.apache.camel.component.google.mail.internal.GoogleMailPropertiesHelper; 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.mail.internal.GoogleMailApiCollection; -import org.apache.camel.component.google.mail.internal.GoogleMailApiName; -import org.apache.camel.component.google.mail.internal.GoogleMailConstants; -import org.apache.camel.component.google.mail.internal.GoogleMailPropertiesHelper; /** * Represents a GoogleMail endpoint. @@ -41,16 +39,17 @@ public class GoogleMailEndpoint extends AbstractApiEndpoint<GoogleMailApiName, G // TODO create and manage API proxy private Object apiProxy; - public GoogleMailEndpoint(String uri, GoogleMailComponent component, - GoogleMailApiName apiName, String methodName, GoogleMailConfiguration endpointConfiguration) { + public GoogleMailEndpoint(String uri, GoogleMailComponent component, GoogleMailApiName apiName, String methodName, GoogleMailConfiguration endpointConfiguration) { super(uri, component, apiName, methodName, GoogleMailApiCollection.getCollection().getHelper(apiName), endpointConfiguration); } + @Override public Producer createProducer() throws Exception { return new GoogleMailProducer(this); } + @Override public Consumer createConsumer(Processor processor) throws Exception { // make sure inBody is not set for consumers if (inBody != null) { @@ -67,6 +66,7 @@ public class GoogleMailEndpoint extends AbstractApiEndpoint<GoogleMailApiName, G return GoogleMailPropertiesHelper.getHelper(); } + @Override protected String getThreadProfileName() { return GoogleMailConstants.THREAD_PROFILE_NAME; } @@ -74,36 +74,36 @@ public class GoogleMailEndpoint extends AbstractApiEndpoint<GoogleMailApiName, G @Override protected void afterConfigureProperties() { switch (apiName) { - case ATTACHMENTS: - apiProxy = getClient().users().messages().attachments(); - break; - case DRAFTS: - apiProxy = getClient().users().drafts(); - break; - case HISTORY: - apiProxy = getClient().users().history(); - break; - case LABELS: - apiProxy = getClient().users().labels(); - break; - case MESSAGES: - apiProxy = getClient().users().messages(); - break; - case THREADS: - apiProxy = getClient().users().threads(); - break; - case USERS: - apiProxy = getClient().users(); - break; - default: - throw new IllegalArgumentException("Invalid API name " + apiName); + case ATTACHMENTS: + apiProxy = getClient().users().messages().attachments(); + break; + case DRAFTS: + apiProxy = getClient().users().drafts(); + break; + case HISTORY: + apiProxy = getClient().users().history(); + break; + case LABELS: + apiProxy = getClient().users().labels(); + break; + case MESSAGES: + apiProxy = getClient().users().messages(); + break; + case THREADS: + apiProxy = getClient().users().threads(); + break; + case USERS: + apiProxy = getClient().users(); + break; + default: + throw new IllegalArgumentException("Invalid API name " + apiName); } } public Gmail getClient() { - return ((GoogleMailComponent)getComponent()).getClient(); + return ((GoogleMailComponent) getComponent()).getClient(); } - + @Override public Object getApiProxy(ApiMethod method, Map<String, Object> args) { return apiProxy; http://git-wip-us.apache.org/repos/asf/camel/blob/38c0a977/components/camel-google-mail/src/main/java/org/apache/camel/component/google/mail/GoogleMailProducer.java ---------------------------------------------------------------------- diff --git a/components/camel-google-mail/src/main/java/org/apache/camel/component/google/mail/GoogleMailProducer.java b/components/camel-google-mail/src/main/java/org/apache/camel/component/google/mail/GoogleMailProducer.java index 763ca17..64d6029 100644 --- a/components/camel-google-mail/src/main/java/org/apache/camel/component/google/mail/GoogleMailProducer.java +++ b/components/camel-google-mail/src/main/java/org/apache/camel/component/google/mail/GoogleMailProducer.java @@ -21,11 +21,10 @@ import java.util.Map; import com.google.api.client.googleapis.services.AbstractGoogleClientRequest; import org.apache.camel.RuntimeCamelException; +import org.apache.camel.component.google.mail.internal.GoogleMailPropertiesHelper; import org.apache.camel.util.IntrospectionSupport; import org.apache.camel.util.component.AbstractApiProducer; import org.apache.camel.util.component.ApiMethod; -import org.apache.camel.component.google.mail.internal.GoogleMailApiName; -import org.apache.camel.component.google.mail.internal.GoogleMailPropertiesHelper; /** * The GoogleMail producer. @@ -35,7 +34,7 @@ public class GoogleMailProducer extends AbstractApiProducer<GoogleMailApiName, G public GoogleMailProducer(GoogleMailEndpoint endpoint) { super(endpoint, GoogleMailPropertiesHelper.getHelper()); } - + @Override protected Object doInvokeMethod(ApiMethod method, Map<String, Object> properties) throws RuntimeCamelException { AbstractGoogleClientRequest request = (AbstractGoogleClientRequest) super.doInvokeMethod(method, properties); http://git-wip-us.apache.org/repos/asf/camel/blob/38c0a977/components/camel-google-mail/src/test/java/org/apache/camel/component/google/mail/AbstractGoogleMailTestSupport.java ---------------------------------------------------------------------- diff --git a/components/camel-google-mail/src/test/java/org/apache/camel/component/google/mail/AbstractGoogleMailTestSupport.java b/components/camel-google-mail/src/test/java/org/apache/camel/component/google/mail/AbstractGoogleMailTestSupport.java index 77f5e35..464e60d 100644 --- a/components/camel-google-mail/src/test/java/org/apache/camel/component/google/mail/AbstractGoogleMailTestSupport.java +++ b/components/camel-google-mail/src/test/java/org/apache/camel/component/google/mail/AbstractGoogleMailTestSupport.java @@ -17,28 +17,25 @@ package org.apache.camel.component.google.mail; import java.io.IOException; -import java.io.InputStream; import java.util.HashMap; import java.util.Map; import java.util.Properties; import org.apache.camel.CamelContext; import org.apache.camel.CamelExecutionException; -import org.apache.camel.component.google.mail.GoogleMailComponent; -import org.apache.camel.component.google.mail.GoogleMailConfiguration; import org.apache.camel.test.junit4.CamelTestSupport; import org.apache.camel.util.IntrospectionSupport; /** - * Abstract base class for GoogleMail Integration tests generated by Camel API component maven plugin. + * Abstract base class for GoogleMail Integration tests generated by Camel API + * component maven plugin. */ public class AbstractGoogleMailTestSupport extends CamelTestSupport { + // userid of the currently authenticated user + protected static final String CURRENT_USERID = "me"; private static final String TEST_OPTIONS_PROPERTIES = "/test-options.properties"; - // userid of the currently authenticated user - public static final String CURRENT_USERID = "me"; - @Override protected CamelContext createCamelContext() throws Exception { @@ -49,8 +46,7 @@ public class AbstractGoogleMailTestSupport extends CamelTestSupport { try { properties.load(getClass().getResourceAsStream(TEST_OPTIONS_PROPERTIES)); } catch (Exception e) { - throw new IOException(String.format("%s could not be loaded: %s", TEST_OPTIONS_PROPERTIES, e.getMessage()), - e); + throw new IOException(String.format("%s could not be loaded: %s", TEST_OPTIONS_PROPERTIES, e.getMessage()), e); } Map<String, Object> options = new HashMap<String, Object>(); @@ -76,8 +72,7 @@ public class AbstractGoogleMailTestSupport extends CamelTestSupport { } @SuppressWarnings("unchecked") - protected <T> T requestBodyAndHeaders(String endpointUri, Object body, Map<String, Object> headers) - throws CamelExecutionException { + protected <T> T requestBodyAndHeaders(String endpointUri, Object body, Map<String, Object> headers) throws CamelExecutionException { return (T) template().requestBodyAndHeaders(endpointUri, body, headers); } http://git-wip-us.apache.org/repos/asf/camel/blob/38c0a977/components/camel-google-mail/src/test/java/org/apache/camel/component/google/mail/GmailUsersIntegrationTest.java ---------------------------------------------------------------------- diff --git a/components/camel-google-mail/src/test/java/org/apache/camel/component/google/mail/GmailUsersIntegrationTest.java b/components/camel-google-mail/src/test/java/org/apache/camel/component/google/mail/GmailUsersIntegrationTest.java index 3e49fac..bf74a88 100644 --- a/components/camel-google-mail/src/test/java/org/apache/camel/component/google/mail/GmailUsersIntegrationTest.java +++ b/components/camel-google-mail/src/test/java/org/apache/camel/component/google/mail/GmailUsersIntegrationTest.java @@ -16,18 +16,11 @@ */ package org.apache.camel.component.google.mail; -import java.util.HashMap; -import java.util.Map; - import org.apache.camel.builder.RouteBuilder; -import org.junit.Ignore; import org.junit.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.apache.camel.component.google.mail.internal.GoogleMailApiCollection; -import org.apache.camel.component.google.mail.internal.GmailUsersApiMethod; - /** * Test class for {@link com.google.api.services.gmail.Gmail$Users} APIs. */ @@ -49,10 +42,10 @@ public class GmailUsersIntegrationTest extends AbstractGoogleMailTestSupport { @Override protected RouteBuilder createRouteBuilder() throws Exception { return new RouteBuilder() { + @Override public void configure() { // test route for getProfile - from("direct://GETPROFILE") - .to("google-mail://" + PATH_PREFIX + "/getProfile?inBody=userId"); + from("direct://GETPROFILE").to("google-mail://" + PATH_PREFIX + "/getProfile?inBody=userId"); } }; http://git-wip-us.apache.org/repos/asf/camel/blob/38c0a977/components/camel-google-mail/src/test/java/org/apache/camel/component/google/mail/GmailUsersLabelsIntegrationTest.java ---------------------------------------------------------------------- diff --git a/components/camel-google-mail/src/test/java/org/apache/camel/component/google/mail/GmailUsersLabelsIntegrationTest.java b/components/camel-google-mail/src/test/java/org/apache/camel/component/google/mail/GmailUsersLabelsIntegrationTest.java index 2773924..69f1d84 100644 --- a/components/camel-google-mail/src/test/java/org/apache/camel/component/google/mail/GmailUsersLabelsIntegrationTest.java +++ b/components/camel-google-mail/src/test/java/org/apache/camel/component/google/mail/GmailUsersLabelsIntegrationTest.java @@ -25,8 +25,6 @@ import org.apache.camel.builder.RouteBuilder; import org.junit.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.apache.camel.component.google.mail.internal.GoogleMailApiCollection; -import org.apache.camel.component.google.mail.internal.GmailUsersLabelsApiMethod; /** * Test class for {@link com.google.api.services.gmail.Gmail$Users$Labels} APIs. @@ -41,7 +39,7 @@ public class GmailUsersLabelsIntegrationTest extends AbstractGoogleMailTestSuppo public void testLabels() throws Exception { // using String message body for single parameter "userId" com.google.api.services.gmail.model.ListLabelsResponse labels = requestBody("direct://LIST", CURRENT_USERID); - + String labelId = null; if (getTestLabel(labels) == null) { Map<String, Object> headers = new HashMap<String, Object>(); @@ -50,9 +48,9 @@ public class GmailUsersLabelsIntegrationTest extends AbstractGoogleMailTestSuppo Label label = new Label().setName(CAMEL_TEST_LABEL).setMessageListVisibility("show").setLabelListVisibility("labelShow"); // parameter type is com.google.api.services.gmail.model.Label headers.put("CamelGoogleMail.content", label); - + com.google.api.services.gmail.model.Label result = requestBodyAndHeaders("direct://CREATE", null, headers); - + assertNotNull("create result", result); labelId = result.getId(); } else { @@ -88,30 +86,25 @@ public class GmailUsersLabelsIntegrationTest extends AbstractGoogleMailTestSuppo @Override protected RouteBuilder createRouteBuilder() throws Exception { return new RouteBuilder() { + @Override public void configure() { // test route for create - from("direct://CREATE") - .to("google-mail://" + PATH_PREFIX + "/create"); + from("direct://CREATE").to("google-mail://" + PATH_PREFIX + "/create"); // test route for delete - from("direct://DELETE") - .to("google-mail://" + PATH_PREFIX + "/delete"); + from("direct://DELETE").to("google-mail://" + PATH_PREFIX + "/delete"); // test route for get - from("direct://GET") - .to("google-mail://" + PATH_PREFIX + "/get"); + from("direct://GET").to("google-mail://" + PATH_PREFIX + "/get"); // test route for list - from("direct://LIST") - .to("google-mail://" + PATH_PREFIX + "/list?inBody=userId"); + from("direct://LIST").to("google-mail://" + PATH_PREFIX + "/list?inBody=userId"); // test route for patch - from("direct://PATCH") - .to("google-mail://" + PATH_PREFIX + "/patch"); + from("direct://PATCH").to("google-mail://" + PATH_PREFIX + "/patch"); // test route for update - from("direct://UPDATE") - .to("google-mail://" + PATH_PREFIX + "/update"); + from("direct://UPDATE").to("google-mail://" + PATH_PREFIX + "/update"); } }; http://git-wip-us.apache.org/repos/asf/camel/blob/38c0a977/components/camel-google-mail/src/test/java/org/apache/camel/component/google/mail/GmailUsersMessagesIntegrationTest.java ---------------------------------------------------------------------- diff --git a/components/camel-google-mail/src/test/java/org/apache/camel/component/google/mail/GmailUsersMessagesIntegrationTest.java b/components/camel-google-mail/src/test/java/org/apache/camel/component/google/mail/GmailUsersMessagesIntegrationTest.java index b682ae0..ff51654 100644 --- a/components/camel-google-mail/src/test/java/org/apache/camel/component/google/mail/GmailUsersMessagesIntegrationTest.java +++ b/components/camel-google-mail/src/test/java/org/apache/camel/component/google/mail/GmailUsersMessagesIntegrationTest.java @@ -36,24 +36,23 @@ import org.apache.camel.builder.RouteBuilder; import org.junit.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.apache.camel.component.google.mail.internal.GoogleMailApiCollection; -import org.apache.camel.component.google.mail.internal.GmailUsersMessagesApiMethod; /** - * Test class for {@link com.google.api.services.gmail.Gmail$Users$Messages} APIs. + * Test class for {@link com.google.api.services.gmail.Gmail$Users$Messages} + * APIs. */ public class GmailUsersMessagesIntegrationTest extends AbstractGoogleMailTestSupport { - // userid of the currently authenticated user + // userid of the currently authenticated user public static final String CURRENT_USERID = "me"; private static final Logger LOG = LoggerFactory.getLogger(GmailUsersMessagesIntegrationTest.class); private static final String PATH_PREFIX = GoogleMailApiCollection.getCollection().getApiName(GmailUsersMessagesApiMethod.class).getName(); @Test public void testMessages() throws Exception { - + // ==== Send test email ==== - Message testEmail = createTestEmail(); + Message testEmail = createTestEmail(); Map<String, Object> headers = new HashMap<String, Object>(); // parameter type is String headers.put("CamelGoogleMail.userId", CURRENT_USERID); @@ -63,7 +62,7 @@ public class GmailUsersMessagesIntegrationTest extends AbstractGoogleMailTestSup com.google.api.services.gmail.model.Message result = requestBodyAndHeaders("direct://SEND", null, headers); assertNotNull("send result", result); String testEmailId = result.getId(); - + // ==== Search for message we just sent ==== headers = new HashMap<String, Object>(); headers.put("CamelGoogleMail.q", "subject:\"Hello from camel-google-mail\""); @@ -85,7 +84,7 @@ public class GmailUsersMessagesIntegrationTest extends AbstractGoogleMailTestSup // using String message body for single parameter "userId" listOfMessages = requestBody("direct://LIST", CURRENT_USERID); assertFalse(idInList(testEmailId, listOfMessages)); - + // ===== untrash it ==== headers = new HashMap<String, Object>(); // parameter type is String @@ -100,7 +99,7 @@ public class GmailUsersMessagesIntegrationTest extends AbstractGoogleMailTestSup // using String message body for single parameter "userId" listOfMessages = requestBody("direct://LIST", CURRENT_USERID); assertTrue(idInList(testEmailId, listOfMessages)); - + // ===== permanently delete it ==== headers = new HashMap<String, Object>(); // parameter type is String @@ -130,11 +129,11 @@ public class GmailUsersMessagesIntegrationTest extends AbstractGoogleMailTestSup } private Message createTestEmail() throws MessagingException, IOException { - com.google.api.services.gmail.model.Profile profile = requestBody("google-mail://users/getProfile?inBody=userId", CURRENT_USERID); + com.google.api.services.gmail.model.Profile profile = requestBody("google-mail://users/getProfile?inBody=userId", CURRENT_USERID); Properties props = new Properties(); Session session = Session.getDefaultInstance(props, null); MimeMessage mm = new MimeMessage(session); - mm.addRecipients(RecipientType.TO, profile.getEmailAddress()); + mm.addRecipients(javax.mail.Message.RecipientType.TO, profile.getEmailAddress()); mm.setSubject("Hello from camel-google-mail"); mm.setContent("Camel rocks!", "text/plain"); Message createMessageWithEmail = createMessageWithEmail(mm); @@ -149,72 +148,59 @@ public class GmailUsersMessagesIntegrationTest extends AbstractGoogleMailTestSup return new MimeMessage(session, new ByteArrayInputStream(emailBytes)); } - - private Message createMessageWithEmail(MimeMessage email) - throws MessagingException, IOException { - ByteArrayOutputStream baos = new ByteArrayOutputStream(); - email.writeTo(baos); - String encodedEmail = Base64.encodeBase64URLSafeString(baos.toByteArray()); - Message message = new Message(); - message.setRaw(encodedEmail); - return message; + + private Message createMessageWithEmail(MimeMessage email) throws MessagingException, IOException { + ByteArrayOutputStream baos = new ByteArrayOutputStream(); + email.writeTo(baos); + String encodedEmail = Base64.encodeBase64URLSafeString(baos.toByteArray()); + Message message = new Message(); + message.setRaw(encodedEmail); + return message; } - + @Override protected RouteBuilder createRouteBuilder() throws Exception { return new RouteBuilder() { + @Override public void configure() { // test route for attachments - from("direct://ATTACHMENTS") - .to("google-mail://" + PATH_PREFIX + "/attachments"); + from("direct://ATTACHMENTS").to("google-mail://" + PATH_PREFIX + "/attachments"); // test route for delete - from("direct://DELETE") - .to("google-mail://" + PATH_PREFIX + "/delete"); + from("direct://DELETE").to("google-mail://" + PATH_PREFIX + "/delete"); // test route for get - from("direct://GET") - .to("google-mail://" + PATH_PREFIX + "/get"); + from("direct://GET").to("google-mail://" + PATH_PREFIX + "/get"); // test route for gmailImport - from("direct://GMAILIMPORT") - .to("google-mail://" + PATH_PREFIX + "/gmailImport"); + from("direct://GMAILIMPORT").to("google-mail://" + PATH_PREFIX + "/gmailImport"); // test route for gmailImport - from("direct://GMAILIMPORT_1") - .to("google-mail://" + PATH_PREFIX + "/gmailImport"); + from("direct://GMAILIMPORT_1").to("google-mail://" + PATH_PREFIX + "/gmailImport"); // test route for insert - from("direct://INSERT") - .to("google-mail://" + PATH_PREFIX + "/insert"); + from("direct://INSERT").to("google-mail://" + PATH_PREFIX + "/insert"); // test route for insert - from("direct://INSERT_1") - .to("google-mail://" + PATH_PREFIX + "/insert"); + from("direct://INSERT_1").to("google-mail://" + PATH_PREFIX + "/insert"); // test route for list - from("direct://LIST") - .to("google-mail://" + PATH_PREFIX + "/list?inBody=userId"); + from("direct://LIST").to("google-mail://" + PATH_PREFIX + "/list?inBody=userId"); // test route for modify - from("direct://MODIFY") - .to("google-mail://" + PATH_PREFIX + "/modify"); + from("direct://MODIFY").to("google-mail://" + PATH_PREFIX + "/modify"); // test route for send - from("direct://SEND") - .to("google-mail://" + PATH_PREFIX + "/send"); + from("direct://SEND").to("google-mail://" + PATH_PREFIX + "/send"); // test route for send - from("direct://SEND_1") - .to("google-mail://" + PATH_PREFIX + "/send"); + from("direct://SEND_1").to("google-mail://" + PATH_PREFIX + "/send"); // test route for trash - from("direct://TRASH") - .to("google-mail://" + PATH_PREFIX + "/trash"); + from("direct://TRASH").to("google-mail://" + PATH_PREFIX + "/trash"); // test route for untrash - from("direct://UNTRASH") - .to("google-mail://" + PATH_PREFIX + "/untrash"); + from("direct://UNTRASH").to("google-mail://" + PATH_PREFIX + "/untrash"); } }; http://git-wip-us.apache.org/repos/asf/camel/blob/38c0a977/components/camel-google-mail/src/test/java/org/apache/camel/component/google/mail/GmailUsersThreadsIntegrationTest.java ---------------------------------------------------------------------- diff --git a/components/camel-google-mail/src/test/java/org/apache/camel/component/google/mail/GmailUsersThreadsIntegrationTest.java b/components/camel-google-mail/src/test/java/org/apache/camel/component/google/mail/GmailUsersThreadsIntegrationTest.java index 023be8c..4ac5f4d 100644 --- a/components/camel-google-mail/src/test/java/org/apache/camel/component/google/mail/GmailUsersThreadsIntegrationTest.java +++ b/components/camel-google-mail/src/test/java/org/apache/camel/component/google/mail/GmailUsersThreadsIntegrationTest.java @@ -31,15 +31,13 @@ import com.google.api.client.repackaged.org.apache.commons.codec.binary.Base64; import com.google.api.services.gmail.model.Message; import org.apache.camel.builder.RouteBuilder; -import org.junit.Ignore; import org.junit.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.apache.camel.component.google.mail.internal.GoogleMailApiCollection; -import org.apache.camel.component.google.mail.internal.GmailUsersThreadsApiMethod; /** - * Test class for {@link com.google.api.services.gmail.Gmail$Users$Threads} APIs. + * Test class for {@link com.google.api.services.gmail.Gmail$Users$Threads} + * APIs. */ public class GmailUsersThreadsIntegrationTest extends AbstractGoogleMailTestSupport { @@ -47,11 +45,11 @@ public class GmailUsersThreadsIntegrationTest extends AbstractGoogleMailTestSupp private static final String PATH_PREFIX = GoogleMailApiCollection.getCollection().getApiName(GmailUsersThreadsApiMethod.class).getName(); private Message createThreadedTestEmail(String previousThreadId) throws MessagingException, IOException { - com.google.api.services.gmail.model.Profile profile = requestBody("google-mail://users/getProfile?inBody=userId", CURRENT_USERID); + com.google.api.services.gmail.model.Profile profile = requestBody("google-mail://users/getProfile?inBody=userId", CURRENT_USERID); Properties props = new Properties(); Session session = Session.getDefaultInstance(props, null); MimeMessage mm = new MimeMessage(session); - mm.addRecipients(RecipientType.TO, profile.getEmailAddress()); + mm.addRecipients(javax.mail.Message.RecipientType.TO, profile.getEmailAddress()); mm.setSubject("Hello from camel-google-mail"); mm.setContent("Camel rocks!", "text/plain"); Message createMessageWithEmail = createMessageWithEmail(mm); @@ -67,32 +65,31 @@ public class GmailUsersThreadsIntegrationTest extends AbstractGoogleMailTestSupp return requestBodyAndHeaders("google-mail://messages/send", null, headers); } - - private Message createMessageWithEmail(MimeMessage email) - throws MessagingException, IOException { - ByteArrayOutputStream baos = new ByteArrayOutputStream(); - email.writeTo(baos); - String encodedEmail = Base64.encodeBase64URLSafeString(baos.toByteArray()); - Message message = new Message(); - message.setRaw(encodedEmail); - return message; + + private Message createMessageWithEmail(MimeMessage email) throws MessagingException, IOException { + ByteArrayOutputStream baos = new ByteArrayOutputStream(); + email.writeTo(baos); + String encodedEmail = Base64.encodeBase64URLSafeString(baos.toByteArray()); + Message message = new Message(); + message.setRaw(encodedEmail); + return message; } - + @Test public void testList() throws Exception { Message m1 = createThreadedTestEmail(null); - Message m2 = createThreadedTestEmail(m1.getThreadId()); - + Message m2 = createThreadedTestEmail(m1.getThreadId()); + Map<String, Object> headers = new HashMap<String, Object>(); headers.put("CamelGoogleMail.q", "subject:\"Hello from camel-google-mail\""); - + // using String message body for single parameter "userId" com.google.api.services.gmail.model.ListThreadsResponse result = requestBodyAndHeaders("direct://LIST", CURRENT_USERID, headers); assertNotNull("list result", result); assertTrue(result.getThreads().size() > 0); LOG.debug("list: " + result); - + headers = new HashMap<String, Object>(); // parameter type is String headers.put("CamelGoogleMail.userId", CURRENT_USERID); @@ -105,30 +102,25 @@ public class GmailUsersThreadsIntegrationTest extends AbstractGoogleMailTestSupp @Override protected RouteBuilder createRouteBuilder() throws Exception { return new RouteBuilder() { + @Override public void configure() { // test route for delete - from("direct://DELETE") - .to("google-mail://" + PATH_PREFIX + "/delete"); + from("direct://DELETE").to("google-mail://" + PATH_PREFIX + "/delete"); // test route for get - from("direct://GET") - .to("google-mail://" + PATH_PREFIX + "/get"); + from("direct://GET").to("google-mail://" + PATH_PREFIX + "/get"); // test route for list - from("direct://LIST") - .to("google-mail://" + PATH_PREFIX + "/list?inBody=userId"); + from("direct://LIST").to("google-mail://" + PATH_PREFIX + "/list?inBody=userId"); // test route for modify - from("direct://MODIFY") - .to("google-mail://" + PATH_PREFIX + "/modify"); + from("direct://MODIFY").to("google-mail://" + PATH_PREFIX + "/modify"); // test route for trash - from("direct://TRASH") - .to("google-mail://" + PATH_PREFIX + "/trash"); + from("direct://TRASH").to("google-mail://" + PATH_PREFIX + "/trash"); // test route for untrash - from("direct://UNTRASH") - .to("google-mail://" + PATH_PREFIX + "/untrash"); + from("direct://UNTRASH").to("google-mail://" + PATH_PREFIX + "/untrash"); } }; http://git-wip-us.apache.org/repos/asf/camel/blob/38c0a977/parent/pom.xml ---------------------------------------------------------------------- diff --git a/parent/pom.xml b/parent/pom.xml index 4d2e17a..7e61552 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -180,6 +180,7 @@ <google-api-client-version>1.19.0</google-api-client-version> <google-api-services-drive-version>v2-rev151-1.19.0</google-api-services-drive-version> <google-api-services-calendar-version>v3-rev99-1.19.0</google-api-services-calendar-version> + <google-api-services-mail-version>v1-rev15-1.19.0</google-api-services-mail-version> <grizzly-websockets-version>2.3.17</grizzly-websockets-version> <groovy-version>2.3.7</groovy-version> <gson-version>2.3</gson-version>
