You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ac...@apache.org on 2018/12/05 10:22:21 UTC
[camel] 13/43: CAMEL-12950 - Fixed CS
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch sandbox/camel-3.x
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 5de6927904c9fb60672e159e2888a66026eb1a9a
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Thu Nov 22 13:27:24 2018 +0100
CAMEL-12950 - Fixed CS
---
.../google/sheets/GoogleSheetsConsumer.java | 8 ++++--
.../google/sheets/GoogleSheetsEndpoint.java | 32 +++++++++-------------
.../google/sheets/GoogleSheetsProducer.java | 8 +++---
.../sheets/GoogleSheetsVerifierExtension.java | 17 +++++-------
.../sheets/internal/GoogleSheetsConstants.java | 2 +-
.../sheets/stream/GoogleSheetsStreamComponent.java | 4 +--
.../stream/GoogleSheetsStreamConfiguration.java | 6 ++--
.../sheets/stream/GoogleSheetsStreamConsumer.java | 12 ++++----
.../sheets/stream/GoogleSheetsStreamEndpoint.java | 7 ++++-
.../sheets/AbstractGoogleSheetsTestSupport.java | 16 +++++------
.../sheets/GoogleSheetsVerifierExtensionTest.java | 8 +++---
.../sheets/SheetsSpreadsheetsIntegrationTest.java | 18 ++++++++----
.../SheetsSpreadsheetsValuesIntegrationTest.java | 16 +++++++++--
13 files changed, 84 insertions(+), 70 deletions(-)
diff --git a/components/camel-google-sheets/src/main/java/org/apache/camel/component/google/sheets/GoogleSheetsConsumer.java b/components/camel-google-sheets/src/main/java/org/apache/camel/component/google/sheets/GoogleSheetsConsumer.java
index b1e5c9b..1517cca 100644
--- a/components/camel-google-sheets/src/main/java/org/apache/camel/component/google/sheets/GoogleSheetsConsumer.java
+++ b/components/camel-google-sheets/src/main/java/org/apache/camel/component/google/sheets/GoogleSheetsConsumer.java
@@ -16,6 +16,11 @@
*/
package org.apache.camel.component.google.sheets;
+
+import java.util.Map;
+import java.util.Map.Entry;
+
+
import com.google.api.client.googleapis.services.AbstractGoogleClientRequest;
import org.apache.camel.Processor;
import org.apache.camel.RuntimeCamelException;
@@ -24,9 +29,6 @@ import org.apache.camel.component.google.sheets.internal.GoogleSheetsApiName;
import org.apache.camel.support.IntrospectionSupport;
import org.apache.camel.support.component.AbstractApiConsumer;
-import java.util.Map;
-import java.util.Map.Entry;
-
/**
* The GoogleSheets consumer.
*/
diff --git a/components/camel-google-sheets/src/main/java/org/apache/camel/component/google/sheets/GoogleSheetsEndpoint.java b/components/camel-google-sheets/src/main/java/org/apache/camel/component/google/sheets/GoogleSheetsEndpoint.java
index 4b245ac..38a0eaa 100644
--- a/components/camel-google-sheets/src/main/java/org/apache/camel/component/google/sheets/GoogleSheetsEndpoint.java
+++ b/components/camel-google-sheets/src/main/java/org/apache/camel/component/google/sheets/GoogleSheetsEndpoint.java
@@ -16,6 +16,8 @@
*/
package org.apache.camel.component.google.sheets;
+import java.util.Map;
+
import com.google.api.services.sheets.v4.Sheets;
import org.apache.camel.Consumer;
import org.apache.camel.Processor;
@@ -30,18 +32,11 @@ import org.apache.camel.support.component.AbstractApiEndpoint;
import org.apache.camel.support.component.ApiMethod;
import org.apache.camel.support.component.ApiMethodPropertiesHelper;
-import java.util.Map;
-
/**
* The google-sheets component provides access to Google Sheets.
*/
-@UriEndpoint(firstVersion = "2.23.0",
- scheme = "google-sheets",
- title = "Google Sheets",
- syntax = "google-sheets:apiName/methodName",
- consumerClass = GoogleSheetsConsumer.class,
- consumerPrefix = "consumer",
- label = "api,cloud,sheets")
+@UriEndpoint(firstVersion = "2.23.0", scheme = "google-sheets", title = "Google Sheets",
+ syntax = "google-sheets:apiName/methodName", consumerClass = GoogleSheetsConsumer.class, consumerPrefix = "consumer", label = "api,cloud,sheets")
public class GoogleSheetsEndpoint extends AbstractApiEndpoint<GoogleSheetsApiName, GoogleSheetsConfiguration> {
@UriParam
@@ -49,8 +44,7 @@ public class GoogleSheetsEndpoint extends AbstractApiEndpoint<GoogleSheetsApiNam
private Object apiProxy;
- public GoogleSheetsEndpoint(String uri, GoogleSheetsComponent component,
- GoogleSheetsApiName apiName, String methodName, GoogleSheetsConfiguration endpointConfiguration) {
+ public GoogleSheetsEndpoint(String uri, GoogleSheetsComponent component, GoogleSheetsApiName apiName, String methodName, GoogleSheetsConfiguration endpointConfiguration) {
super(uri, component, apiName, methodName, GoogleSheetsApiCollection.getCollection().getHelper(apiName), endpointConfiguration);
this.configuration = endpointConfiguration;
}
@@ -85,14 +79,14 @@ public class GoogleSheetsEndpoint extends AbstractApiEndpoint<GoogleSheetsApiNam
@Override
protected void afterConfigureProperties() {
switch (apiName) {
- case SPREADSHEETS:
- apiProxy = getClient().spreadsheets();
- break;
- case DATA:
- apiProxy = getClient().spreadsheets().values();
- break;
- default:
- throw new IllegalArgumentException("Invalid API name " + apiName);
+ case SPREADSHEETS:
+ apiProxy = getClient().spreadsheets();
+ break;
+ case DATA:
+ apiProxy = getClient().spreadsheets().values();
+ break;
+ default:
+ throw new IllegalArgumentException("Invalid API name " + apiName);
}
}
diff --git a/components/camel-google-sheets/src/main/java/org/apache/camel/component/google/sheets/GoogleSheetsProducer.java b/components/camel-google-sheets/src/main/java/org/apache/camel/component/google/sheets/GoogleSheetsProducer.java
index 024fe25..017958e 100644
--- a/components/camel-google-sheets/src/main/java/org/apache/camel/component/google/sheets/GoogleSheetsProducer.java
+++ b/components/camel-google-sheets/src/main/java/org/apache/camel/component/google/sheets/GoogleSheetsProducer.java
@@ -16,6 +16,9 @@
*/
package org.apache.camel.component.google.sheets;
+import java.util.Map;
+import java.util.Map.Entry;
+
import com.google.api.client.googleapis.services.AbstractGoogleClientRequest;
import org.apache.camel.RuntimeCamelException;
import org.apache.camel.TypeConverter;
@@ -25,9 +28,6 @@ import org.apache.camel.support.IntrospectionSupport;
import org.apache.camel.support.component.AbstractApiProducer;
import org.apache.camel.support.component.ApiMethod;
-import java.util.Map;
-import java.util.Map.Entry;
-
/**
* The GoogleSheets producer.
*/
@@ -39,7 +39,7 @@ public class GoogleSheetsProducer extends AbstractApiProducer<GoogleSheetsApiNam
@Override
protected Object doInvokeMethod(ApiMethod method, Map<String, Object> properties) throws RuntimeCamelException {
- AbstractGoogleClientRequest<?> request = (AbstractGoogleClientRequest) super.doInvokeMethod(method, properties);
+ AbstractGoogleClientRequest<?> request = (AbstractGoogleClientRequest)super.doInvokeMethod(method, properties);
try {
TypeConverter typeConverter = getEndpoint().getCamelContext().getTypeConverter();
for (Entry<String, Object> p : properties.entrySet()) {
diff --git a/components/camel-google-sheets/src/main/java/org/apache/camel/component/google/sheets/GoogleSheetsVerifierExtension.java b/components/camel-google-sheets/src/main/java/org/apache/camel/component/google/sheets/GoogleSheetsVerifierExtension.java
index a531908..26100cf 100644
--- a/components/camel-google-sheets/src/main/java/org/apache/camel/component/google/sheets/GoogleSheetsVerifierExtension.java
+++ b/components/camel-google-sheets/src/main/java/org/apache/camel/component/google/sheets/GoogleSheetsVerifierExtension.java
@@ -16,6 +16,10 @@
*/
package org.apache.camel.component.google.sheets;
+import java.util.Map;
+import java.util.Optional;
+import java.util.UUID;
+
import com.google.api.services.sheets.v4.Sheets;
import org.apache.camel.CamelContext;
import org.apache.camel.component.extension.verifier.DefaultComponentVerifierExtension;
@@ -23,10 +27,6 @@ import org.apache.camel.component.extension.verifier.ResultBuilder;
import org.apache.camel.component.extension.verifier.ResultErrorBuilder;
import org.apache.camel.component.extension.verifier.ResultErrorHelper;
-import java.util.Map;
-import java.util.Optional;
-import java.util.UUID;
-
public class GoogleSheetsVerifierExtension extends DefaultComponentVerifierExtension {
public GoogleSheetsVerifierExtension(String defaultScheme) {
@@ -61,12 +61,9 @@ public class GoogleSheetsVerifierExtension extends DefaultComponentVerifierExten
try {
GoogleSheetsConfiguration configuration = setProperties(new GoogleSheetsConfiguration(), parameters);
GoogleSheetsClientFactory clientFactory = new BatchGoogleSheetsClientFactory();
- Sheets client = clientFactory.makeClient(configuration.getClientId(), configuration.getClientSecret(),
- configuration.getApplicationName(),
- configuration.getRefreshToken(), configuration.getAccessToken());
- client.spreadsheets().get(Optional.ofNullable(parameters.get("spreadsheetId"))
- .map(Object::toString)
- .orElse(UUID.randomUUID().toString())).execute();
+ Sheets client = clientFactory.makeClient(configuration.getClientId(), configuration.getClientSecret(), configuration.getApplicationName(),
+ configuration.getRefreshToken(), configuration.getAccessToken());
+ client.spreadsheets().get(Optional.ofNullable(parameters.get("spreadsheetId")).map(Object::toString).orElse(UUID.randomUUID().toString())).execute();
} catch (Exception e) {
ResultErrorBuilder errorBuilder = ResultErrorBuilder.withCodeAndDescription(VerificationError.StandardCode.AUTHENTICATION, e.getMessage())
.detail("google_sheets_exception_message", e.getMessage()).detail(VerificationError.ExceptionAttribute.EXCEPTION_CLASS, e.getClass().getName())
diff --git a/components/camel-google-sheets/src/main/java/org/apache/camel/component/google/sheets/internal/GoogleSheetsConstants.java b/components/camel-google-sheets/src/main/java/org/apache/camel/component/google/sheets/internal/GoogleSheetsConstants.java
index a14a251..feb9141 100644
--- a/components/camel-google-sheets/src/main/java/org/apache/camel/component/google/sheets/internal/GoogleSheetsConstants.java
+++ b/components/camel-google-sheets/src/main/java/org/apache/camel/component/google/sheets/internal/GoogleSheetsConstants.java
@@ -29,5 +29,5 @@ public final class GoogleSheetsConstants {
/**
* Prevent instantiation.
*/
- private GoogleSheetsConstants() {}
+ private GoogleSheetsConstants() { }
}
diff --git a/components/camel-google-sheets/src/main/java/org/apache/camel/component/google/sheets/stream/GoogleSheetsStreamComponent.java b/components/camel-google-sheets/src/main/java/org/apache/camel/component/google/sheets/stream/GoogleSheetsStreamComponent.java
index 08dade6..3eeb3fe 100644
--- a/components/camel-google-sheets/src/main/java/org/apache/camel/component/google/sheets/stream/GoogleSheetsStreamComponent.java
+++ b/components/camel-google-sheets/src/main/java/org/apache/camel/component/google/sheets/stream/GoogleSheetsStreamComponent.java
@@ -16,6 +16,8 @@
*/
package org.apache.camel.component.google.sheets.stream;
+import java.util.Map;
+
import com.google.api.services.sheets.v4.Sheets;
import org.apache.camel.CamelContext;
import org.apache.camel.Endpoint;
@@ -25,8 +27,6 @@ import org.apache.camel.component.google.sheets.GoogleSheetsVerifierExtension;
import org.apache.camel.spi.Metadata;
import org.apache.camel.support.DefaultComponent;
-import java.util.Map;
-
/**
* Represents the component that manages {@link GoogleSheetsStreamEndpoint}.
*/
diff --git a/components/camel-google-sheets/src/main/java/org/apache/camel/component/google/sheets/stream/GoogleSheetsStreamConfiguration.java b/components/camel-google-sheets/src/main/java/org/apache/camel/component/google/sheets/stream/GoogleSheetsStreamConfiguration.java
index 3a88ffb..e72446c 100644
--- a/components/camel-google-sheets/src/main/java/org/apache/camel/component/google/sheets/stream/GoogleSheetsStreamConfiguration.java
+++ b/components/camel-google-sheets/src/main/java/org/apache/camel/component/google/sheets/stream/GoogleSheetsStreamConfiguration.java
@@ -16,15 +16,15 @@
*/
package org.apache.camel.component.google.sheets.stream;
+import java.util.Collections;
+import java.util.List;
+
import com.google.api.services.sheets.v4.SheetsScopes;
import org.apache.camel.RuntimeCamelException;
import org.apache.camel.spi.UriParam;
import org.apache.camel.spi.UriParams;
import org.apache.camel.spi.UriPath;
-import java.util.Collections;
-import java.util.List;
-
/**
* Component configuration for GoogleSheets stream component.
*/
diff --git a/components/camel-google-sheets/src/main/java/org/apache/camel/component/google/sheets/stream/GoogleSheetsStreamConsumer.java b/components/camel-google-sheets/src/main/java/org/apache/camel/component/google/sheets/stream/GoogleSheetsStreamConsumer.java
index 7136a50..c59618a 100644
--- a/components/camel-google-sheets/src/main/java/org/apache/camel/component/google/sheets/stream/GoogleSheetsStreamConsumer.java
+++ b/components/camel-google-sheets/src/main/java/org/apache/camel/component/google/sheets/stream/GoogleSheetsStreamConsumer.java
@@ -16,6 +16,12 @@
*/
package org.apache.camel.component.google.sheets.stream;
+import java.util.ArrayDeque;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.Queue;
+import java.util.stream.Collectors;
+
import com.google.api.services.sheets.v4.Sheets;
import com.google.api.services.sheets.v4.model.BatchGetValuesResponse;
import com.google.api.services.sheets.v4.model.Spreadsheet;
@@ -28,12 +34,6 @@ import org.apache.camel.util.ObjectHelper;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import java.util.ArrayDeque;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.Queue;
-import java.util.stream.Collectors;
-
/**
* The GoogleSheets consumer.
*/
diff --git a/components/camel-google-sheets/src/main/java/org/apache/camel/component/google/sheets/stream/GoogleSheetsStreamEndpoint.java b/components/camel-google-sheets/src/main/java/org/apache/camel/component/google/sheets/stream/GoogleSheetsStreamEndpoint.java
index c8c6e71..e9bc6e4 100644
--- a/components/camel-google-sheets/src/main/java/org/apache/camel/component/google/sheets/stream/GoogleSheetsStreamEndpoint.java
+++ b/components/camel-google-sheets/src/main/java/org/apache/camel/component/google/sheets/stream/GoogleSheetsStreamEndpoint.java
@@ -19,7 +19,12 @@ package org.apache.camel.component.google.sheets.stream;
import com.google.api.services.sheets.v4.Sheets;
import com.google.api.services.sheets.v4.model.Spreadsheet;
import com.google.api.services.sheets.v4.model.ValueRange;
-import org.apache.camel.*;
+
+import org.apache.camel.Consumer;
+import org.apache.camel.Exchange;
+import org.apache.camel.Message;
+import org.apache.camel.Processor;
+import org.apache.camel.Producer;
import org.apache.camel.component.google.sheets.GoogleSheetsClientFactory;
import org.apache.camel.spi.UriEndpoint;
import org.apache.camel.spi.UriParam;
diff --git a/components/camel-google-sheets/src/test/java/org/apache/camel/component/google/sheets/AbstractGoogleSheetsTestSupport.java b/components/camel-google-sheets/src/test/java/org/apache/camel/component/google/sheets/AbstractGoogleSheetsTestSupport.java
index 0f9c9a4..0542d3d 100644
--- a/components/camel-google-sheets/src/test/java/org/apache/camel/component/google/sheets/AbstractGoogleSheetsTestSupport.java
+++ b/components/camel-google-sheets/src/test/java/org/apache/camel/component/google/sheets/AbstractGoogleSheetsTestSupport.java
@@ -16,6 +16,14 @@
*/
package org.apache.camel.component.google.sheets;
+import java.io.IOException;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Properties;
+import java.util.Random;
+
import com.google.api.services.sheets.v4.model.Sheet;
import com.google.api.services.sheets.v4.model.SheetProperties;
import com.google.api.services.sheets.v4.model.Spreadsheet;
@@ -27,14 +35,6 @@ import org.apache.camel.support.IntrospectionSupport;
import org.apache.camel.test.junit4.CamelTestSupport;
-import java.io.IOException;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Properties;
-import java.util.Random;
-
/**
* Abstract base class for GoogleSheets Integration tests generated by Camel
* API component maven plugin.
diff --git a/components/camel-google-sheets/src/test/java/org/apache/camel/component/google/sheets/GoogleSheetsVerifierExtensionTest.java b/components/camel-google-sheets/src/test/java/org/apache/camel/component/google/sheets/GoogleSheetsVerifierExtensionTest.java
index a4504a8..9af19c7 100644
--- a/components/camel-google-sheets/src/test/java/org/apache/camel/component/google/sheets/GoogleSheetsVerifierExtensionTest.java
+++ b/components/camel-google-sheets/src/test/java/org/apache/camel/component/google/sheets/GoogleSheetsVerifierExtensionTest.java
@@ -16,16 +16,16 @@
*/
package org.apache.camel.component.google.sheets;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.UUID;
+
import org.apache.camel.Component;
import org.apache.camel.component.extension.ComponentVerifierExtension;
import org.apache.camel.test.junit4.CamelTestSupport;
import org.junit.Assert;
import org.junit.Test;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.UUID;
-
public class GoogleSheetsVerifierExtensionTest extends CamelTestSupport {
@Override
diff --git a/components/camel-google-sheets/src/test/java/org/apache/camel/component/google/sheets/SheetsSpreadsheetsIntegrationTest.java b/components/camel-google-sheets/src/test/java/org/apache/camel/component/google/sheets/SheetsSpreadsheetsIntegrationTest.java
index 680c08c..800d023 100644
--- a/components/camel-google-sheets/src/test/java/org/apache/camel/component/google/sheets/SheetsSpreadsheetsIntegrationTest.java
+++ b/components/camel-google-sheets/src/test/java/org/apache/camel/component/google/sheets/SheetsSpreadsheetsIntegrationTest.java
@@ -16,7 +16,18 @@
*/
package org.apache.camel.component.google.sheets;
-import com.google.api.services.sheets.v4.model.*;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Random;
+
+import com.google.api.services.sheets.v4.model.BatchUpdateSpreadsheetRequest;
+import com.google.api.services.sheets.v4.model.BatchUpdateSpreadsheetResponse;
+import com.google.api.services.sheets.v4.model.Request;
+import com.google.api.services.sheets.v4.model.Spreadsheet;
+import com.google.api.services.sheets.v4.model.SpreadsheetProperties;
+import com.google.api.services.sheets.v4.model.UpdateSpreadsheetPropertiesRequest;
+
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.google.sheets.internal.GoogleSheetsApiCollection;
import org.apache.camel.component.google.sheets.internal.SheetsSpreadsheetsApiMethod;
@@ -24,11 +35,6 @@ import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Random;
-
/**
* Test class for {@link com.google.api.services.sheets.v4.Sheets.Spreadsheets} APIs.
*/
diff --git a/components/camel-google-sheets/src/test/java/org/apache/camel/component/google/sheets/SheetsSpreadsheetsValuesIntegrationTest.java b/components/camel-google-sheets/src/test/java/org/apache/camel/component/google/sheets/SheetsSpreadsheetsValuesIntegrationTest.java
index 0e00a0c..0075f7a 100644
--- a/components/camel-google-sheets/src/test/java/org/apache/camel/component/google/sheets/SheetsSpreadsheetsValuesIntegrationTest.java
+++ b/components/camel-google-sheets/src/test/java/org/apache/camel/component/google/sheets/SheetsSpreadsheetsValuesIntegrationTest.java
@@ -16,7 +16,19 @@
*/
package org.apache.camel.component.google.sheets;
-import com.google.api.services.sheets.v4.model.*;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import com.google.api.services.sheets.v4.model.AppendValuesResponse;
+import com.google.api.services.sheets.v4.model.ClearValuesRequest;
+import com.google.api.services.sheets.v4.model.ClearValuesResponse;
+import com.google.api.services.sheets.v4.model.Spreadsheet;
+import com.google.api.services.sheets.v4.model.UpdateValuesResponse;
+import com.google.api.services.sheets.v4.model.ValueRange;
+
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.google.sheets.internal.GoogleSheetsApiCollection;
import org.apache.camel.component.google.sheets.internal.SheetsSpreadsheetsValuesApiMethod;
@@ -24,8 +36,6 @@ import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import java.util.*;
-
/**
* Test class for {@link com.google.api.services.sheets.v4.Sheets.Spreadsheets.Values} APIs.
*/