This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 65e6db54f5358b24b5a15e74bfb899f6b2f0b2bf
Author: Jon Chase <jch...@agari.com>
AuthorDate: Sat Jun 6 06:29:42 2020 -0400
CAMEL-14992: formatting
---
.../component/aws2/athena/Athena2Component.java | 4 +-
.../athena/Athena2ComponentVerifierExtension.java | 36 ++----
.../component/aws2/athena/Athena2Endpoint.java | 21 +---
.../component/aws2/athena/Athena2Producer.java | 30 ++---
.../component/aws2/athena/Athena2QueryHelper.java | 12 +-
.../aws2/athena/Athena2QueryHelperTest.java | 9 +-
.../athena/AthenaComponentClientRegistryTest.java | 4 +-
.../athena/AthenaComponentConfigurationTest.java | 14 +--
.../component/aws2/athena/AthenaComponentTest.java | 45 +++-----
.../AthenaComponentVerifierExtensionTest.java | 25 +----
.../AthenaComponentIntegrationTest.java | 121 ++++++++-------------
11 files changed, 105 insertions(+), 216 deletions(-)
diff --git
a/components/camel-aws2-athena/src/main/java/org/apache/camel/component/aws2/athena/Athena2Component.java
b/components/camel-aws2-athena/src/main/java/org/apache/camel/component/aws2/athena/Athena2Component.java
index 492db05..8343332 100644
---
a/components/camel-aws2-athena/src/main/java/org/apache/camel/component/aws2/athena/Athena2Component.java
+++
b/components/camel-aws2-athena/src/main/java/org/apache/camel/component/aws2/athena/Athena2Component.java
@@ -51,9 +51,7 @@ public class Athena2Component extends DefaultComponent {
@Override
protected Endpoint createEndpoint(String uri, String remaining,
Map<String, Object> parameters) throws Exception {
- Athena2Configuration
- configuration =
- this.configuration != null ? this.configuration.copy() : new
Athena2Configuration();
+ Athena2Configuration configuration = this.configuration != null ?
this.configuration.copy() : new Athena2Configuration();
Athena2Endpoint endpoint = new Athena2Endpoint(uri, this,
configuration);
setProperties(endpoint, parameters);
checkAndSetRegistryClient(configuration, endpoint);
diff --git
a/components/camel-aws2-athena/src/main/java/org/apache/camel/component/aws2/athena/Athena2ComponentVerifierExtension.java
b/components/camel-aws2-athena/src/main/java/org/apache/camel/component/aws2/athena/Athena2ComponentVerifierExtension.java
index 6ff7f50..2647e77 100644
---
a/components/camel-aws2-athena/src/main/java/org/apache/camel/component/aws2/athena/Athena2ComponentVerifierExtension.java
+++
b/components/camel-aws2-athena/src/main/java/org/apache/camel/component/aws2/athena/Athena2ComponentVerifierExtension.java
@@ -45,16 +45,12 @@ public class Athena2ComponentVerifierExtension extends
DefaultComponentVerifierE
@Override
protected Result verifyParameters(Map<String, Object> parameters) {
-
- ResultBuilder
- builder =
- ResultBuilder.withStatusAndScope(Result.Status.OK,
Scope.PARAMETERS)
- .error(ResultErrorHelper.requiresOption("accessKey",
parameters))
- .error(ResultErrorHelper.requiresOption("secretKey",
parameters))
- .error(ResultErrorHelper.requiresOption("region", parameters));
+ ResultBuilder builder =
ResultBuilder.withStatusAndScope(Result.Status.OK, Scope.PARAMETERS)
+ .error(ResultErrorHelper.requiresOption("accessKey", parameters))
+ .error(ResultErrorHelper.requiresOption("secretKey", parameters))
+ .error(ResultErrorHelper.requiresOption("region", parameters));
// Validate using the catalog
-
super.verifyParametersAgainstCatalog(builder, parameters);
return builder.build();
@@ -70,28 +66,18 @@ public class Athena2ComponentVerifierExtension extends
DefaultComponentVerifierE
try {
Athena2Configuration configuration = setProperties(new
Athena2Configuration(), parameters);
if
(!AthenaClient.serviceMetadata().regions().contains(Region.of(configuration.getRegion())))
{
- ResultErrorBuilder
- errorBuilder =
-
ResultErrorBuilder.withCodeAndDescription(VerificationError.StandardCode.ILLEGAL_PARAMETER,
- "The service is not supported in this region");
+ ResultErrorBuilder errorBuilder =
ResultErrorBuilder.withCodeAndDescription(VerificationError.StandardCode.ILLEGAL_PARAMETER,
"The service is not supported in this region");
return builder.error(errorBuilder.build()).build();
}
- AwsBasicCredentials
- cred =
- AwsBasicCredentials.create(configuration.getAccessKey(),
configuration.getSecretKey());
+ AwsBasicCredentials cred =
AwsBasicCredentials.create(configuration.getAccessKey(),
configuration.getSecretKey());
AthenaClientBuilder clientBuilder = AthenaClient.builder();
- AthenaClient
- client =
-
clientBuilder.credentialsProvider(StaticCredentialsProvider.create(cred))
- .region(Region.of(configuration.getRegion())).build();
+ AthenaClient client =
clientBuilder.credentialsProvider(StaticCredentialsProvider.create(cred)).region(Region.of(configuration.getRegion())).build();
client.listQueryExecutions();
} catch (AwsServiceException e) {
- ResultErrorBuilder
- errorBuilder =
-
ResultErrorBuilder.withCodeAndDescription(VerificationError.StandardCode.AUTHENTICATION,
e.getMessage())
- .detail("aws_athena_exception_message", e.getMessage())
-
.detail(VerificationError.ExceptionAttribute.EXCEPTION_CLASS,
e.getClass().getName())
-
.detail(VerificationError.ExceptionAttribute.EXCEPTION_INSTANCE, e);
+ ResultErrorBuilder errorBuilder =
ResultErrorBuilder.withCodeAndDescription(VerificationError.StandardCode.AUTHENTICATION,
e.getMessage())
+ .detail("aws_athena_exception_message", e.getMessage())
+ .detail(VerificationError.ExceptionAttribute.EXCEPTION_CLASS,
e.getClass().getName())
+
.detail(VerificationError.ExceptionAttribute.EXCEPTION_INSTANCE, e);
builder.error(errorBuilder.build());
} catch (Exception e) {
diff --git
a/components/camel-aws2-athena/src/main/java/org/apache/camel/component/aws2/athena/Athena2Endpoint.java
b/components/camel-aws2-athena/src/main/java/org/apache/camel/component/aws2/athena/Athena2Endpoint.java
index 403f49c..4686896 100644
---
a/components/camel-aws2-athena/src/main/java/org/apache/camel/component/aws2/athena/Athena2Endpoint.java
+++
b/components/camel-aws2-athena/src/main/java/org/apache/camel/component/aws2/athena/Athena2Endpoint.java
@@ -66,9 +66,8 @@ public class Athena2Endpoint extends DefaultEndpoint {
public void doInit() throws Exception {
super.doInit();
- athenaClient =
- configuration.getAmazonAthenaClient() != null ?
configuration.getAmazonAthenaClient()
- : createAthenaClient();
+ athenaClient = configuration.getAmazonAthenaClient() != null ?
configuration.getAmazonAthenaClient()
+ : createAthenaClient();
}
@Override
@@ -103,25 +102,17 @@ public class Athena2Endpoint extends DefaultEndpoint {
ProxyConfiguration.Builder proxyConfig = null;
ApacheHttpClient.Builder httpClientBuilder = null;
boolean isClientConfigFound = false;
- if (ObjectHelper.isNotEmpty(configuration.getProxyHost()) &&
ObjectHelper
- .isNotEmpty(configuration.getProxyPort())) {
+ if (ObjectHelper.isNotEmpty(configuration.getProxyHost()) &&
ObjectHelper.isNotEmpty(configuration.getProxyPort())) {
proxyConfig = ProxyConfiguration.builder();
- URI
- proxyEndpoint =
- URI.create(configuration.getProxyProtocol() + "://" +
configuration.getProxyHost() + ":" + configuration
- .getProxyPort());
+ URI proxyEndpoint = URI.create(configuration.getProxyProtocol() +
"://" + configuration.getProxyHost() + ":" + configuration.getProxyPort());
proxyConfig.endpoint(proxyEndpoint);
httpClientBuilder =
ApacheHttpClient.builder().proxyConfiguration(proxyConfig.build());
isClientConfigFound = true;
}
if (configuration.getAccessKey() != null &&
configuration.getSecretKey() != null) {
- AwsBasicCredentials
- cred =
- AwsBasicCredentials.create(configuration.getAccessKey(),
configuration.getSecretKey());
+ AwsBasicCredentials cred =
AwsBasicCredentials.create(configuration.getAccessKey(),
configuration.getSecretKey());
if (isClientConfigFound) {
- clientBuilder =
- clientBuilder.httpClientBuilder(httpClientBuilder)
-
.credentialsProvider(StaticCredentialsProvider.create(cred));
+ clientBuilder =
clientBuilder.httpClientBuilder(httpClientBuilder).credentialsProvider(StaticCredentialsProvider.create(cred));
} else {
clientBuilder =
clientBuilder.credentialsProvider(StaticCredentialsProvider.create(cred));
}
diff --git
a/components/camel-aws2-athena/src/main/java/org/apache/camel/component/aws2/athena/Athena2Producer.java
b/components/camel-aws2-athena/src/main/java/org/apache/camel/component/aws2/athena/Athena2Producer.java
index 53b0ee6..acbc36d 100644
---
a/components/camel-aws2-athena/src/main/java/org/apache/camel/component/aws2/athena/Athena2Producer.java
+++
b/components/camel-aws2-athena/src/main/java/org/apache/camel/component/aws2/athena/Athena2Producer.java
@@ -81,8 +81,7 @@ public class Athena2Producer extends DefaultProducer {
Athena2Operations operation =
exchange.getIn().getHeader(Athena2Constants.OPERATION, Athena2Operations.class);
if (operation == null) {
Athena2Operations defaultOperation =
Athena2Operations.startQueryExecution;
- operation =
- getConfiguration().getOperation() == null ? defaultOperation :
getConfiguration().getOperation();
+ operation = getConfiguration().getOperation() == null ?
defaultOperation : getConfiguration().getOperation();
}
return operation;
}
@@ -94,12 +93,9 @@ public class Athena2Producer extends DefaultProducer {
String queryExecutionId = determineQueryExecutionId(exchange);
GetQueryExecutionResponse getQueryExecutionResponse =
doGetQueryExecution(queryExecutionId, athenaClient);
Message message = getMessageForResponse(exchange);
- message.setHeader(Athena2Constants.QUERY_EXECUTION_ID,
- getQueryExecutionResponse.queryExecution().queryExecutionId());
- message.setHeader(Athena2Constants.QUERY_EXECUTION_STATE,
- getQueryExecutionResponse.queryExecution().status().state());
- message.setHeader(Athena2Constants.OUTPUT_LOCATION,
-
getQueryExecutionResponse.queryExecution().resultConfiguration().outputLocation());
+ message.setHeader(Athena2Constants.QUERY_EXECUTION_ID,
getQueryExecutionResponse.queryExecution().queryExecutionId());
+ message.setHeader(Athena2Constants.QUERY_EXECUTION_STATE,
getQueryExecutionResponse.queryExecution().status().state());
+ message.setHeader(Athena2Constants.OUTPUT_LOCATION,
getQueryExecutionResponse.queryExecution().resultConfiguration().outputLocation());
message.setBody(getQueryExecutionResponse);
}
@@ -133,8 +129,7 @@ public class Athena2Producer extends DefaultProducer {
GetQueryExecutionResponse response =
doGetQueryExecution(queryExecutionId, athenaClient);
String outputLocation =
response.queryExecution().resultConfiguration().outputLocation();
message.setHeader(Athena2Constants.QUERY_EXECUTION_STATE,
response.queryExecution().status().state());
- message.setHeader(Athena2Constants.OUTPUT_LOCATION,
-
response.queryExecution().resultConfiguration().outputLocation());
+ message.setHeader(Athena2Constants.OUTPUT_LOCATION,
response.queryExecution().resultConfiguration().outputLocation());
message.setBody(outputLocation);
} else {
throw new IllegalArgumentException("AWS Athena output type [" +
outputType + "] is not supported. Must be "
@@ -143,9 +138,7 @@ public class Athena2Producer extends DefaultProducer {
}
private Athena2OutputType determineOutputType(Exchange exchange) {
- Athena2OutputType
- outputType =
- exchange.getIn().getHeader(Athena2Constants.OUTPUT_TYPE,
Athena2OutputType.class);
+ Athena2OutputType outputType =
exchange.getIn().getHeader(Athena2Constants.OUTPUT_TYPE,
Athena2OutputType.class);
if (ObjectHelper.isEmpty(outputType)) {
outputType = getConfiguration().getOutputType();
@@ -214,10 +207,10 @@ public class Athena2Producer extends DefaultProducer {
Message message = getMessageForResponse(exchange);
message.setHeader(Athena2Constants.QUERY_EXECUTION_ID,
queryExecutionId);
- message.setHeader(Athena2Constants.QUERY_EXECUTION_STATE,
- getQueryExecutionResponse == null ? null :
getQueryExecutionResponse.queryExecution().status().state());
- message.setHeader(Athena2Constants.OUTPUT_LOCATION,
getQueryExecutionResponse == null ? null
- :
getQueryExecutionResponse.queryExecution().resultConfiguration().outputLocation());
+ message.setHeader(Athena2Constants.QUERY_EXECUTION_STATE,
getQueryExecutionResponse == null
+ ? null :
getQueryExecutionResponse.queryExecution().status().state());
+ message.setHeader(Athena2Constants.OUTPUT_LOCATION,
getQueryExecutionResponse == null
+ ? null :
getQueryExecutionResponse.queryExecution().resultConfiguration().outputLocation());
message.setHeader(Athena2Constants.START_QUERY_EXECUTION_ATTEMPTS,
athena2QueryHelper.getAttempts());
message.setHeader(Athena2Constants.START_QUERY_EXECUTION_ELAPSED_MILLIS,
athena2QueryHelper.getElapsedMillis());
@@ -371,8 +364,7 @@ public class Athena2Producer extends DefaultProducer {
}
private EncryptionOption determineEncryptionOption(final Exchange
exchange) {
- EncryptionOption encryptionOption =
- exchange.getIn().getHeader(Athena2Constants.ENCRYPTION_OPTION,
EncryptionOption.class);
+ EncryptionOption encryptionOption =
exchange.getIn().getHeader(Athena2Constants.ENCRYPTION_OPTION,
EncryptionOption.class);
if (ObjectHelper.isEmpty(encryptionOption)) {
encryptionOption = getConfiguration().getEncryptionOption();
diff --git
a/components/camel-aws2-athena/src/main/java/org/apache/camel/component/aws2/athena/Athena2QueryHelper.java
b/components/camel-aws2-athena/src/main/java/org/apache/camel/component/aws2/athena/Athena2QueryHelper.java
index 1223f5a..f7991fa 100644
---
a/components/camel-aws2-athena/src/main/java/org/apache/camel/component/aws2/athena/Athena2QueryHelper.java
+++
b/components/camel-aws2-athena/src/main/java/org/apache/camel/component/aws2/athena/Athena2QueryHelper.java
@@ -133,10 +133,9 @@ class Athena2QueryHelper {
long now = now();
long millisWaited = now - this.startMs;
if (millisWaited >= this.waitTimeout) {
- LOG
- .trace("AWS Athena start query execution waited for {}, which
exceeded wait timeout of {}",
- millisWaited,
- this.waitTimeout);
+ LOG.trace("AWS Athena start query execution waited for {}, which
exceeded wait timeout of {}",
+ millisWaited,
+ this.waitTimeout);
return false;
}
@@ -168,9 +167,8 @@ class Athena2QueryHelper {
Thread.sleep(this.currentDelay);
} catch (InterruptedException e) {
this.interrupted = Thread.interrupted(); // store, then clear,
interrupt status
- LOG
- .trace(
- "AWS Athena start query execution wait thread was
interrupted; will return at earliest opportunity");
+ LOG.trace(
+ "AWS Athena start query execution wait thread was interrupted;
will return at earliest opportunity");
}
this.currentDelay = this.delay;
}
diff --git
a/components/camel-aws2-athena/src/test/java/org/apache/camel/component/aws2/athena/Athena2QueryHelperTest.java
b/components/camel-aws2-athena/src/test/java/org/apache/camel/component/aws2/athena/Athena2QueryHelperTest.java
index 9c0f6ca..332c92f 100644
---
a/components/camel-aws2-athena/src/test/java/org/apache/camel/component/aws2/athena/Athena2QueryHelperTest.java
+++
b/components/camel-aws2-athena/src/test/java/org/apache/camel/component/aws2/athena/Athena2QueryHelperTest.java
@@ -230,8 +230,7 @@ public class Athena2QueryHelperTest {
@Test
public void shouldRetryReturnsFalseWhenRetryIsNever() {
Athena2QueryHelper helper = athena2QueryHelperWithRetry("never");
- assertFalse(
-
helper.shouldRetry(newGetQueryExecutionResponse(QueryExecutionState.FAILED,
"GENERIC_INTERNAL_ERROR")));
+
assertFalse(helper.shouldRetry(newGetQueryExecutionResponse(QueryExecutionState.FAILED,
"GENERIC_INTERNAL_ERROR")));
}
@Test
@@ -243,15 +242,13 @@ public class Athena2QueryHelperTest {
@Test
public void shouldRetryReturnsTrueForGenericInternalError() {
Athena2QueryHelper helper = athena2QueryHelperWithRetry("retryable");
- assertTrue(
-
helper.shouldRetry(newGetQueryExecutionResponse(QueryExecutionState.FAILED,
"GENERIC_INTERNAL_ERROR")));
+
assertTrue(helper.shouldRetry(newGetQueryExecutionResponse(QueryExecutionState.FAILED,
"GENERIC_INTERNAL_ERROR")));
}
@Test
public void shouldRetryReturnsTrueForExhaustedResourcedError() {
Athena2QueryHelper helper = athena2QueryHelperWithRetry("retryable");
- assertTrue(helper.shouldRetry(
- newGetQueryExecutionResponse(QueryExecutionState.FAILED,
"exhausted resources at this scale factor")));
+
assertTrue(helper.shouldRetry(newGetQueryExecutionResponse(QueryExecutionState.FAILED,
"exhausted resources at this scale factor")));
}
@Test
diff --git
a/components/camel-aws2-athena/src/test/java/org/apache/camel/component/aws2/athena/AthenaComponentClientRegistryTest.java
b/components/camel-aws2-athena/src/test/java/org/apache/camel/component/aws2/athena/AthenaComponentClientRegistryTest.java
index 3a3535c..84f8a7a 100644
---
a/components/camel-aws2-athena/src/test/java/org/apache/camel/component/aws2/athena/AthenaComponentClientRegistryTest.java
+++
b/components/camel-aws2-athena/src/test/java/org/apache/camel/component/aws2/athena/AthenaComponentClientRegistryTest.java
@@ -37,8 +37,6 @@ public class AthenaComponentClientRegistryTest extends
CamelTestSupport {
@Test
public void createEndpointWithMinimalAthenaClientMisconfiguration() throws
Exception {
Athena2Component component = context.getComponent("aws2-athena",
Athena2Component.class);
- assertThrows(IllegalArgumentException.class, () -> {
- component.createEndpoint("aws2-athena://label");
- });
+ assertThrows(IllegalArgumentException.class, () ->
component.createEndpoint("aws2-athena://label"));
}
}
diff --git
a/components/camel-aws2-athena/src/test/java/org/apache/camel/component/aws2/athena/AthenaComponentConfigurationTest.java
b/components/camel-aws2-athena/src/test/java/org/apache/camel/component/aws2/athena/AthenaComponentConfigurationTest.java
index 84ddea6..a3dabd2 100644
---
a/components/camel-aws2-athena/src/test/java/org/apache/camel/component/aws2/athena/AthenaComponentConfigurationTest.java
+++
b/components/camel-aws2-athena/src/test/java/org/apache/camel/component/aws2/athena/AthenaComponentConfigurationTest.java
@@ -29,9 +29,7 @@ public class AthenaComponentConfigurationTest extends
CamelTestSupport {
@Test
public void createEndpointWithAccessAndSecretKey() throws Exception {
Athena2Component component = context.getComponent("aws2-athena",
Athena2Component.class);
- Athena2Endpoint
- endpoint =
- (Athena2Endpoint)
component.createEndpoint("aws2-athena://label?accessKey=xxxxx&secretKey=yyyyy");
+ Athena2Endpoint endpoint = (Athena2Endpoint)
component.createEndpoint("aws2-athena://label?accessKey=xxxxx&secretKey=yyyyy");
assertEquals("xxxxx", endpoint.getConfiguration().getAccessKey());
assertEquals("yyyyy", endpoint.getConfiguration().getSecretKey());
@@ -55,10 +53,7 @@ public class AthenaComponentConfigurationTest extends
CamelTestSupport {
component.getConfiguration().setAccessKey("XXX");
component.getConfiguration().setSecretKey("YYY");
component.getConfiguration().setRegion(Region.US_WEST_1.toString());
- Athena2Endpoint
- endpoint =
- (Athena2Endpoint) component
-
.createEndpoint("aws2-athena://label?accessKey=xxxxxx&secretKey=yyyyy®ion=US_EAST_1");
+ Athena2Endpoint endpoint = (Athena2Endpoint)
component.createEndpoint("aws2-athena://label?accessKey=xxxxxx&secretKey=yyyyy®ion=US_EAST_1");
assertEquals("xxxxxx", endpoint.getConfiguration().getAccessKey());
assertEquals("yyyyy", endpoint.getConfiguration().getSecretKey());
@@ -71,10 +66,7 @@ public class AthenaComponentConfigurationTest extends
CamelTestSupport {
component.getConfiguration().setAccessKey("XXX");
component.getConfiguration().setSecretKey("YYY");
component.getConfiguration().setRegion(Region.US_WEST_1.toString());
- Athena2Endpoint
- endpoint =
- (Athena2Endpoint) component.createEndpoint(
-
"aws2-athena://label?accessKey=xxxxxx&secretKey=yyyyy®ion=US_EAST_1&proxyHost=localhost&proxyPort=9000&proxyProtocol=HTTP");
+ Athena2Endpoint endpoint = (Athena2Endpoint)
component.createEndpoint("aws2-athena://label?accessKey=xxxxxx&secretKey=yyyyy®ion=US_EAST_1&proxyHost=localhost&proxyPort=9000&proxyProtocol=HTTP");
assertEquals("xxxxxx", endpoint.getConfiguration().getAccessKey());
assertEquals("yyyyy", endpoint.getConfiguration().getSecretKey());
diff --git
a/components/camel-aws2-athena/src/test/java/org/apache/camel/component/aws2/athena/AthenaComponentTest.java
b/components/camel-aws2-athena/src/test/java/org/apache/camel/component/aws2/athena/AthenaComponentTest.java
index defb398..6fe05c2 100644
---
a/components/camel-aws2-athena/src/test/java/org/apache/camel/component/aws2/athena/AthenaComponentTest.java
+++
b/components/camel-aws2-athena/src/test/java/org/apache/camel/component/aws2/athena/AthenaComponentTest.java
@@ -68,10 +68,8 @@ public class AthenaComponentTest extends CamelTestSupport {
}
}).getMessage();
- assertEquals("11111111-1111-1111-1111-111111111111",
- message.getHeader(Athena2Constants.QUERY_EXECUTION_ID,
String.class));
- assertEquals(QueryExecutionState.SUCCEEDED,
- message.getHeader(Athena2Constants.QUERY_EXECUTION_STATE,
QueryExecutionState.class));
+ assertEquals("11111111-1111-1111-1111-111111111111",
message.getHeader(Athena2Constants.QUERY_EXECUTION_ID, String.class));
+ assertEquals(QueryExecutionState.SUCCEEDED,
message.getHeader(Athena2Constants.QUERY_EXECUTION_STATE,
QueryExecutionState.class));
assertEquals("s3://bucket/file.csv",
message.getHeader(Athena2Constants.OUTPUT_LOCATION, String.class));
GetQueryExecutionResponse result =
message.getBody(GetQueryExecutionResponse.class);
@@ -92,8 +90,7 @@ public class AthenaComponentTest extends CamelTestSupport {
}
}).getMessage();
- assertEquals("11111111-1111-1111-1111-111111111111",
- message.getHeader(Athena2Constants.QUERY_EXECUTION_ID,
String.class));
+ assertEquals("11111111-1111-1111-1111-111111111111",
message.getHeader(Athena2Constants.QUERY_EXECUTION_ID, String.class));
GetQueryResultsIterable result =
message.getBody(GetQueryResultsIterable.class);
List<GetQueryResultsResponse> responses = new ArrayList<>();
@@ -115,8 +112,7 @@ public class AthenaComponentTest extends CamelTestSupport {
}
}).getMessage();
- assertEquals("11111111-1111-1111-1111-111111111111",
- message.getHeader(Athena2Constants.QUERY_EXECUTION_ID,
String.class));
+ assertEquals("11111111-1111-1111-1111-111111111111",
message.getHeader(Athena2Constants.QUERY_EXECUTION_ID, String.class));
GetQueryResultsResponse result =
message.getBody(GetQueryResultsResponse.class);
assertEquals(1, result.resultSet().rows().size());
@@ -136,10 +132,8 @@ public class AthenaComponentTest extends CamelTestSupport {
}
}).getMessage();
- assertEquals("11111111-1111-1111-1111-111111111111",
- message.getHeader(Athena2Constants.QUERY_EXECUTION_ID,
String.class));
- assertEquals(QueryExecutionState.SUCCEEDED,
- message.getHeader(Athena2Constants.QUERY_EXECUTION_STATE,
QueryExecutionState.class));
+ assertEquals("11111111-1111-1111-1111-111111111111",
message.getHeader(Athena2Constants.QUERY_EXECUTION_ID, String.class));
+ assertEquals(QueryExecutionState.SUCCEEDED,
message.getHeader(Athena2Constants.QUERY_EXECUTION_STATE,
QueryExecutionState.class));
assertEquals("s3://bucket/file.csv",
message.getHeader(Athena2Constants.OUTPUT_LOCATION, String.class));
String result = message.getBody(String.class);
@@ -184,8 +178,7 @@ public class AthenaComponentTest extends CamelTestSupport {
}
}).getMessage();
- assertEquals("11111111-1111-1111-1111-111111111111",
- message.getHeader(Athena2Constants.QUERY_EXECUTION_ID,
String.class));
+ assertEquals("11111111-1111-1111-1111-111111111111",
message.getHeader(Athena2Constants.QUERY_EXECUTION_ID, String.class));
assertEquals(1,
message.getHeader(Athena2Constants.START_QUERY_EXECUTION_ATTEMPTS,
Integer.class));
assertTrue(message.getHeader(Athena2Constants.START_QUERY_EXECUTION_ELAPSED_MILLIS,
Integer.class) >= 0);
@@ -211,8 +204,7 @@ public class AthenaComponentTest extends CamelTestSupport {
assertEquals("11111111-1111-1111-1111-111111111111",
message.getHeader(Athena2Constants.QUERY_EXECUTION_ID,
String.class));
assertEquals("s3://bucket/file.csv",
message.getHeader(Athena2Constants.OUTPUT_LOCATION, String.class));
- assertEquals(QueryExecutionState.SUCCEEDED,
- message.getHeader(Athena2Constants.QUERY_EXECUTION_STATE,
QueryExecutionState.class));
+ assertEquals(QueryExecutionState.SUCCEEDED,
message.getHeader(Athena2Constants.QUERY_EXECUTION_STATE,
QueryExecutionState.class));
assertEquals(1,
message.getHeader(Athena2Constants.START_QUERY_EXECUTION_ATTEMPTS,
Integer.class));
assertTrue(message.getHeader(Athena2Constants.START_QUERY_EXECUTION_ELAPSED_MILLIS,
Integer.class) > 0);
@@ -257,11 +249,9 @@ public class AthenaComponentTest extends CamelTestSupport {
}
}).getMessage();
- assertEquals("22222222-2222-2222-2222-222222222222",
- message.getHeader(Athena2Constants.QUERY_EXECUTION_ID,
String.class));
+ assertEquals("22222222-2222-2222-2222-222222222222",
message.getHeader(Athena2Constants.QUERY_EXECUTION_ID, String.class));
assertEquals("s3://bucket/file.csv",
message.getHeader(Athena2Constants.OUTPUT_LOCATION, String.class));
- assertEquals(QueryExecutionState.SUCCEEDED,
- message.getHeader(Athena2Constants.QUERY_EXECUTION_STATE,
QueryExecutionState.class));
+ assertEquals(QueryExecutionState.SUCCEEDED,
message.getHeader(Athena2Constants.QUERY_EXECUTION_STATE,
QueryExecutionState.class));
assertEquals(2,
message.getHeader(Athena2Constants.START_QUERY_EXECUTION_ATTEMPTS,
Integer.class));
assertTrue(message.getHeader(Athena2Constants.START_QUERY_EXECUTION_ELAPSED_MILLIS,
Integer.class) > 0);
@@ -306,11 +296,9 @@ public class AthenaComponentTest extends CamelTestSupport {
}
}).getMessage();
- assertEquals("22222222-2222-2222-2222-222222222222",
- message.getHeader(Athena2Constants.QUERY_EXECUTION_ID,
String.class));
+ assertEquals("22222222-2222-2222-2222-222222222222",
message.getHeader(Athena2Constants.QUERY_EXECUTION_ID, String.class));
assertEquals("s3://bucket/file.csv",
message.getHeader(Athena2Constants.OUTPUT_LOCATION, String.class));
- assertEquals(QueryExecutionState.FAILED,
- message.getHeader(Athena2Constants.QUERY_EXECUTION_STATE,
QueryExecutionState.class));
+ assertEquals(QueryExecutionState.FAILED,
message.getHeader(Athena2Constants.QUERY_EXECUTION_STATE,
QueryExecutionState.class));
assertEquals(2,
message.getHeader(Athena2Constants.START_QUERY_EXECUTION_ATTEMPTS,
Integer.class));
assertTrue(message.getHeader(Athena2Constants.START_QUERY_EXECUTION_ELAPSED_MILLIS,
Integer.class) > 0);
@@ -341,8 +329,7 @@ public class AthenaComponentTest extends CamelTestSupport {
public void process(Exchange exchange) {
exchange.getIn().setBody("SELECT 1");
exchange.getIn().setHeader(Athena2Constants.OUTPUT_LOCATION,
"s3://bucket/file.csv");
- exchange.getIn()
- .setHeader(Athena2Constants.WAIT_TIMEOUT, 100); //
insufficient for query execution time (500ms)
+ exchange.getIn().setHeader(Athena2Constants.WAIT_TIMEOUT,
100); // insufficient for query execution time (500ms)
exchange.getIn().setHeader(Athena2Constants.INITIAL_DELAY, 1);
exchange.getIn().setHeader(Athena2Constants.DELAY, 1);
exchange.getIn().setHeader(Athena2Constants.MAX_ATTEMPTS, 1);
@@ -350,11 +337,9 @@ public class AthenaComponentTest extends CamelTestSupport {
}
}).getMessage();
- assertEquals("33333333-3333-3333-3333-333333333333",
- message.getHeader(Athena2Constants.QUERY_EXECUTION_ID,
String.class));
+ assertEquals("33333333-3333-3333-3333-333333333333",
message.getHeader(Athena2Constants.QUERY_EXECUTION_ID, String.class));
assertEquals("s3://bucket/file.csv",
message.getHeader(Athena2Constants.OUTPUT_LOCATION, String.class));
- assertEquals(QueryExecutionState.RUNNING,
- message.getHeader(Athena2Constants.QUERY_EXECUTION_STATE,
QueryExecutionState.class));
+ assertEquals(QueryExecutionState.RUNNING,
message.getHeader(Athena2Constants.QUERY_EXECUTION_STATE,
QueryExecutionState.class));
assertEquals(1,
message.getHeader(Athena2Constants.START_QUERY_EXECUTION_ATTEMPTS,
Integer.class));
assertTrue(message.getHeader(Athena2Constants.START_QUERY_EXECUTION_ELAPSED_MILLIS,
Integer.class) > 500);
diff --git
a/components/camel-aws2-athena/src/test/java/org/apache/camel/component/aws2/athena/AthenaComponentVerifierExtensionTest.java
b/components/camel-aws2-athena/src/test/java/org/apache/camel/component/aws2/athena/AthenaComponentVerifierExtensionTest.java
index 0da1f13..d52c098 100644
---
a/components/camel-aws2-athena/src/test/java/org/apache/camel/component/aws2/athena/AthenaComponentVerifierExtensionTest.java
+++
b/components/camel-aws2-athena/src/test/java/org/apache/camel/component/aws2/athena/AthenaComponentVerifierExtensionTest.java
@@ -40,9 +40,7 @@ public class AthenaComponentVerifierExtensionTest extends
CamelTestSupport {
public void testParameters() throws Exception {
Component component = context().getComponent("aws2-athena");
- ComponentVerifierExtension
- verifier =
-
component.getExtension(ComponentVerifierExtension.class).orElseThrow(IllegalStateException::new);
+ ComponentVerifierExtension verifier =
component.getExtension(ComponentVerifierExtension.class).orElseThrow(IllegalStateException::new);
Map<String, Object> parameters = new HashMap<>();
parameters.put("secretKey", "l");
@@ -51,9 +49,7 @@ public class AthenaComponentVerifierExtensionTest extends
CamelTestSupport {
parameters.put("label", "l");
parameters.put("operation", "startQueryExecution");
- ComponentVerifierExtension.Result
- result =
- verifier.verify(ComponentVerifierExtension.Scope.PARAMETERS,
parameters);
+ ComponentVerifierExtension.Result result =
verifier.verify(ComponentVerifierExtension.Scope.PARAMETERS, parameters);
assertEquals(ComponentVerifierExtension.Result.Status.OK,
result.getStatus());
}
@@ -61,9 +57,7 @@ public class AthenaComponentVerifierExtensionTest extends
CamelTestSupport {
@Test
public void testConnectivity() throws Exception {
Component component = context().getComponent("aws2-athena");
- ComponentVerifierExtension
- verifier =
-
component.getExtension(ComponentVerifierExtension.class).orElseThrow(IllegalStateException::new);
+ ComponentVerifierExtension verifier =
component.getExtension(ComponentVerifierExtension.class).orElseThrow(IllegalStateException::new);
Map<String, Object> parameters = new HashMap<>();
parameters.put("secretKey", "l");
@@ -72,9 +66,7 @@ public class AthenaComponentVerifierExtensionTest extends
CamelTestSupport {
parameters.put("label", "l");
parameters.put("operation", "startQueryExecution");
- ComponentVerifierExtension.Result
- result =
- verifier.verify(ComponentVerifierExtension.Scope.CONNECTIVITY,
parameters);
+ ComponentVerifierExtension.Result result =
verifier.verify(ComponentVerifierExtension.Scope.CONNECTIVITY, parameters);
assertEquals(ComponentVerifierExtension.Result.Status.ERROR,
result.getStatus());
}
@@ -82,9 +74,7 @@ public class AthenaComponentVerifierExtensionTest extends
CamelTestSupport {
@Test
public void testConnectivityAndRegion() throws Exception {
Component component = context().getComponent("aws2-athena");
- ComponentVerifierExtension
- verifier =
-
component.getExtension(ComponentVerifierExtension.class).orElseThrow(IllegalStateException::new);
+ ComponentVerifierExtension verifier =
component.getExtension(ComponentVerifierExtension.class).orElseThrow(IllegalStateException::new);
Map<String, Object> parameters = new HashMap<>();
parameters.put("secretKey", "l");
@@ -93,11 +83,8 @@ public class AthenaComponentVerifierExtensionTest extends
CamelTestSupport {
parameters.put("label", "l");
parameters.put("operation", "startQueryExecution");
- ComponentVerifierExtension.Result
- result =
- verifier.verify(ComponentVerifierExtension.Scope.CONNECTIVITY,
parameters);
+ ComponentVerifierExtension.Result result =
verifier.verify(ComponentVerifierExtension.Scope.CONNECTIVITY, parameters);
assertEquals(ComponentVerifierExtension.Result.Status.ERROR,
result.getStatus());
}
}
-
diff --git
a/components/camel-aws2-athena/src/test/java/org/apache/camel/component/aws2/athena/integration/AthenaComponentIntegrationTest.java
b/components/camel-aws2-athena/src/test/java/org/apache/camel/component/aws2/athena/integration/AthenaComponentIntegrationTest.java
index d4b55cf..8e346131 100644
---
a/components/camel-aws2-athena/src/test/java/org/apache/camel/component/aws2/athena/integration/AthenaComponentIntegrationTest.java
+++
b/components/camel-aws2-athena/src/test/java/org/apache/camel/component/aws2/athena/integration/AthenaComponentIntegrationTest.java
@@ -57,8 +57,7 @@ public class AthenaComponentIntegrationTest extends
CamelTestSupport {
assertValidQueryExecutionIdHeader(exchange);
assertValidOutputLocationHeader(exchange);
- assertNotNull(
-
exchange.getMessage().getHeader(Athena2Constants.QUERY_EXECUTION_STATE,
QueryExecutionState.class));
+
assertNotNull(exchange.getMessage().getHeader(Athena2Constants.QUERY_EXECUTION_STATE,
QueryExecutionState.class));
GetQueryExecutionResponse response =
exchange.getMessage().getBody(GetQueryExecutionResponse.class);
assertEquals("SELECT 1", response.queryExecution().query());
@@ -66,8 +65,7 @@ public class AthenaComponentIntegrationTest extends
CamelTestSupport {
@Test
public void athenaGetQueryResultsAsStreamListTest() {
- Exchange
- exchange =
+ Exchange exchange =
template.send("direct:athenaGetQueryResultsAsStreamListTest",
ExchangePattern.InOut, new Processor() {
@Override
public void process(Exchange exchange) {
@@ -99,8 +97,7 @@ public class AthenaComponentIntegrationTest extends
CamelTestSupport {
@Test
public void athenaGetQueryResultsAsSelectListTest() {
- Exchange
- exchange =
+ Exchange exchange =
template.send("direct:athenaGetQueryResultsAsSelectListTest",
ExchangePattern.InOut, new Processor() {
@Override
public void process(Exchange exchange) {
@@ -128,8 +125,7 @@ public class AthenaComponentIntegrationTest extends
CamelTestSupport {
@Test
public void athenaGetQueryResultsAsS3PointerTest() {
- Exchange
- exchange =
+ Exchange exchange =
template.send("direct:athenaGetQueryResultsAsS3PointerTest",
ExchangePattern.InOut, new Processor() {
@Override
public void process(Exchange exchange) {
@@ -138,8 +134,7 @@ public class AthenaComponentIntegrationTest extends
CamelTestSupport {
assertValidQueryExecutionIdHeader(exchange);
assertValidOutputLocationHeader(exchange);
- assertEquals(QueryExecutionState.SUCCEEDED,
-
exchange.getMessage().getHeader(Athena2Constants.QUERY_EXECUTION_STATE,
QueryExecutionState.class));
+ assertEquals(QueryExecutionState.SUCCEEDED,
exchange.getMessage().getHeader(Athena2Constants.QUERY_EXECUTION_STATE,
QueryExecutionState.class));
String response = exchange.getMessage().getBody(String.class);
assertTrue(response.startsWith(s3Bucket));
@@ -147,8 +142,7 @@ public class AthenaComponentIntegrationTest extends
CamelTestSupport {
@Test
public void athenaListQueryExecutionsTest() {
- Exchange
- exchange =
+ Exchange exchange =
template.send("direct:athenaListQueryExecutionsTest",
ExchangePattern.InOut, new Processor() {
@Override
public void process(Exchange exchange) {
@@ -161,8 +155,7 @@ public class AthenaComponentIntegrationTest extends
CamelTestSupport {
@Test
public void athenaListQueryExecutionsSetsNextTokenTest() {
- Exchange
- exchange =
+ Exchange exchange =
template.send("direct:athenaListQueryExecutionsSetsNextTokenTest",
ExchangePattern.InOut, new Processor() {
@Override
public void process(Exchange exchange) {
@@ -177,8 +170,7 @@ public class AthenaComponentIntegrationTest extends
CamelTestSupport {
@Test
public void athenaStartQueryExecutionIncludesTraceInQuery() {
- Exchange
- exchange =
+ Exchange exchange =
template
.send("direct:athenaStartQueryExecutionIncludesTraceInQuery",
ExchangePattern.InOut, new Processor() {
@Override
@@ -187,15 +179,13 @@ public class AthenaComponentIntegrationTest extends
CamelTestSupport {
});
GetQueryExecutionResponse response =
exchange.getMessage().getBody(GetQueryExecutionResponse.class);
- assertTrue(response.queryExecution().query().startsWith(
- "-- {\"fromEndpointUri\":
\"direct://athenaStartQueryExecutionIncludesTraceInQuery\", \"exchangeId\": "));
+ assertTrue(response.queryExecution().query().startsWith("--
{\"fromEndpointUri\":
\"direct://athenaStartQueryExecutionIncludesTraceInQuery\", \"exchangeId\": "));
assertTrue(response.queryExecution().query().endsWith("\nSELECT 1"));
}
@Test
public void athenaStartQueryExecutionWaitForQueryCompletionTest() {
- Exchange
- exchange =
+ Exchange exchange =
template.send("direct:athenaStartQueryExecutionWaitForQueryCompletionTest",
ExchangePattern.InOut,
new Processor() {
@Override
@@ -205,12 +195,10 @@ public class AthenaComponentIntegrationTest extends
CamelTestSupport {
assertValidQueryExecutionIdHeader(exchange);
assertValidOutputLocationHeader(exchange);
- assertEquals(QueryExecutionState.SUCCEEDED,
-
exchange.getMessage().getHeader(Athena2Constants.QUERY_EXECUTION_STATE,
QueryExecutionState.class));
+ assertEquals(QueryExecutionState.SUCCEEDED,
exchange.getMessage().getHeader(Athena2Constants.QUERY_EXECUTION_STATE,
QueryExecutionState.class));
assertTrue(exchange.getMessage().getHeader(Athena2Constants.START_QUERY_EXECUTION_ATTEMPTS,
Integer.class) > 0);
- assertTrue(
-
exchange.getMessage().getHeader(Athena2Constants.START_QUERY_EXECUTION_ELAPSED_MILLIS,
Long.class) > 0);
+
assertTrue(exchange.getMessage().getHeader(Athena2Constants.START_QUERY_EXECUTION_ELAPSED_MILLIS,
Long.class) > 0);
GetQueryExecutionResponse response =
exchange.getMessage().getBody(GetQueryExecutionResponse.class);
assertEquals(response.queryExecution().query(), "SELECT 1");
@@ -219,45 +207,38 @@ public class AthenaComponentIntegrationTest extends
CamelTestSupport {
@Test
public void
athenaStartQueryExecutionByDefaultDoesNotWaitForCompletionTest() {
Exchange exchange =
- template
-
.send("direct:athenaStartQueryExecutionByDefaultDoesNotWaitForCompletionTest",
ExchangePattern.InOut,
- new Processor() {
- @Override
- public void process(Exchange exchange) {
- }
- });
+
template.send("direct:athenaStartQueryExecutionByDefaultDoesNotWaitForCompletionTest",
ExchangePattern.InOut,
+ new Processor() {
+ @Override
+ public void process(Exchange exchange) {
+ }
+ });
assertValidQueryExecutionIdHeader(exchange);
assertNull(exchange.getMessage().getHeader(Athena2Constants.QUERY_EXECUTION_STATE));
assertNull(exchange.getMessage().getHeader(Athena2Constants.OUTPUT_LOCATION,
String.class));
assertTrue(exchange.getMessage().getHeader(Athena2Constants.START_QUERY_EXECUTION_ATTEMPTS,
Integer.class) > 0);
- assertTrue(
-
exchange.getMessage().getHeader(Athena2Constants.START_QUERY_EXECUTION_ELAPSED_MILLIS,
Long.class) > 0);
+
assertTrue(exchange.getMessage().getHeader(Athena2Constants.START_QUERY_EXECUTION_ELAPSED_MILLIS,
Long.class) > 0);
assertNull(exchange.getMessage().getBody());
}
@Test
public void athenaStartQueryExecutionHandlesInvalidSqlTest() {
- Exchange
- exchange =
- template
- .send("direct:athenaStartQueryExecutionHandlesInvalidSqlTest",
ExchangePattern.InOut, new Processor() {
- @Override
- public void process(Exchange exchange) {
- }
- });
+ Exchange exchange =
+
template.send("direct:athenaStartQueryExecutionHandlesInvalidSqlTest",
ExchangePattern.InOut, new Processor() {
+ @Override
+ public void process(Exchange exchange) {
+ }
+ });
assertValidQueryExecutionIdHeader(exchange);
assertValidOutputLocationHeader(exchange);
- assertEquals(QueryExecutionState.FAILED,
-
exchange.getMessage().getHeader(Athena2Constants.QUERY_EXECUTION_STATE,
QueryExecutionState.class));
+ assertEquals(QueryExecutionState.FAILED,
exchange.getMessage().getHeader(Athena2Constants.QUERY_EXECUTION_STATE,
QueryExecutionState.class));
- assertEquals(3,
-
exchange.getMessage().getHeader(Athena2Constants.START_QUERY_EXECUTION_ATTEMPTS,
Integer.class));
- assertTrue(
-
exchange.getMessage().getHeader(Athena2Constants.START_QUERY_EXECUTION_ELAPSED_MILLIS,
Long.class) > 0);
+ assertEquals(3,
exchange.getMessage().getHeader(Athena2Constants.START_QUERY_EXECUTION_ATTEMPTS,
Integer.class));
+
assertTrue(exchange.getMessage().getHeader(Athena2Constants.START_QUERY_EXECUTION_ELAPSED_MILLIS,
Long.class) > 0);
GetQueryExecutionResponse response =
exchange.getMessage().getBody(GetQueryExecutionResponse.class);
assertEquals(QueryExecutionState.FAILED,
response.queryExecution().status().state());
@@ -266,8 +247,7 @@ public class AthenaComponentIntegrationTest extends
CamelTestSupport {
@Test
public void athenaStartQueryExecutionHandlesMalformedSqlTest() {
- Exchange
- exchange =
+ Exchange exchange =
template.send("direct:athenaStartQueryExecutionHandlesMalformedSqlTest",
ExchangePattern.InOut,
new Processor() {
@Override
@@ -283,8 +263,7 @@ public class AthenaComponentIntegrationTest extends
CamelTestSupport {
@Test
public void athenaStartQueryExecutionTest() {
- Exchange
- exchange =
+ Exchange exchange =
template.send("direct:athenaStartQueryExecutionTest",
ExchangePattern.InOut, new Processor() {
@Override
public void process(Exchange exchange) {
@@ -296,8 +275,7 @@ public class AthenaComponentIntegrationTest extends
CamelTestSupport {
@Test
public void athenaStartQueryExecutionAndGetQueryExecutionUsingHeaders() {
- Exchange
- exchange =
+ Exchange exchange =
template.send("direct:athenaStartQueryExecutionAndGetQueryExecutionUsingHeaders",
ExchangePattern.InOut,
new Processor() {
@Override
@@ -311,8 +289,7 @@ public class AthenaComponentIntegrationTest extends
CamelTestSupport {
@Test
public void
athenaStartQueryExecutionAndGetQueryResultsByWaitingWithALoop() {
- Exchange
- exchange =
+ Exchange exchange =
template.send("direct:athenaStartQueryExecutionAndGetQueryResultsByWaitingWithALoop",
ExchangePattern.InOut,
new Processor() {
@Override
@@ -322,17 +299,14 @@ public class AthenaComponentIntegrationTest extends
CamelTestSupport {
assertValidQueryExecutionIdHeader(exchange);
assertValidOutputLocationHeader(exchange);
- assertEquals(QueryExecutionState.SUCCEEDED,
-
exchange.getMessage().getHeader(Athena2Constants.QUERY_EXECUTION_STATE,
QueryExecutionState.class));
+ assertEquals(QueryExecutionState.SUCCEEDED,
exchange.getMessage().getHeader(Athena2Constants.QUERY_EXECUTION_STATE,
QueryExecutionState.class));
String response = exchange.getMessage().getBody(String.class);
assertTrue(response.startsWith(s3Bucket));
}
private void assertValidQueryExecutionIdHeader(Exchange exchange) {
- UUID
- queryExecutionId =
-
UUID.fromString(exchange.getMessage().getHeader(Athena2Constants.QUERY_EXECUTION_ID,
String.class));
+ UUID queryExecutionId =
UUID.fromString(exchange.getMessage().getHeader(Athena2Constants.QUERY_EXECUTION_ID,
String.class));
assertNotNull(queryExecutionId);
}
@@ -360,8 +334,7 @@ public class AthenaComponentIntegrationTest extends
CamelTestSupport {
+ " (1, 'a'),"
+ " (2, 'b')"
+ ") AS t (id, name)"))
-
.to("aws2-athena://label?operation=startQueryExecution&waitTimeout=60000&outputLocation="
+ s3Bucket
- + "&" + awsCreds)
+
.to("aws2-athena://label?operation=startQueryExecution&waitTimeout=60000&outputLocation="
+ s3Bucket + "&" + awsCreds)
.to("aws2-athena://label?operation=getQueryResults&outputType=StreamList&" +
awsCreds);
from("direct:athenaGetQueryResultsAsSelectListTest")
@@ -371,14 +344,12 @@ public class AthenaComponentIntegrationTest extends
CamelTestSupport {
+ " (1, 'a'),"
+ " (2, 'b')"
+ ") AS t (id, name)"))
-
.to("aws2-athena://label?operation=startQueryExecution&waitTimeout=60000&outputLocation="
+ s3Bucket
- + "&" + awsCreds)
+
.to("aws2-athena://label?operation=startQueryExecution&waitTimeout=60000&outputLocation="
+ s3Bucket + "&" + awsCreds)
.to("aws2-athena://label?operation=getQueryResults&outputType=SelectList&" +
awsCreds);
from("direct:athenaGetQueryResultsAsS3PointerTest")
.setBody(constant("SELECT 1"))
-
.to("aws2-athena://label?operation=startQueryExecution&waitTimeout=60000&outputLocation="
+ s3Bucket
- + "&" + awsCreds)
+
.to("aws2-athena://label?operation=startQueryExecution&waitTimeout=60000&outputLocation="
+ s3Bucket + "&" + awsCreds)
.to("aws2-athena://label?operation=getQueryResults&outputType=S3Pointer&" +
awsCreds);
from("direct:athenaListQueryExecutionsTest")
@@ -395,34 +366,28 @@ public class AthenaComponentIntegrationTest extends
CamelTestSupport {
from("direct:athenaStartQueryExecutionIncludesTraceInQuery")
.setBody(constant("SELECT 1"))
-
.to("aws2-athena://label?operation=startQueryExecution&includeTrace=true&outputLocation="
+ s3Bucket
- + "&" + awsCreds)
+
.to("aws2-athena://label?operation=startQueryExecution&includeTrace=true&outputLocation="
+ s3Bucket + "&" + awsCreds)
.to("aws2-athena://label?operation=getQueryExecution&" +
awsCreds);
from("direct:athenaStartQueryExecutionWaitForQueryCompletionTest")
.setBody(constant("SELECT 1"))
-
.to("aws2-athena://label?operation=startQueryExecution&waitTimeout=60000&outputLocation="
+ s3Bucket
- + "&" + awsCreds);
+
.to("aws2-athena://label?operation=startQueryExecution&waitTimeout=60000&outputLocation="
+ s3Bucket + "&" + awsCreds);
from("direct:athenaStartQueryExecutionByDefaultDoesNotWaitForCompletionTest")
.setBody(constant("SELECT 1"))
-
.to("aws2-athena://label?operation=startQueryExecution&outputLocation=" +
s3Bucket + "&"
- + awsCreds);
+
.to("aws2-athena://label?operation=startQueryExecution&outputLocation=" +
s3Bucket + "&" + awsCreds);
from("direct:athenaStartQueryExecutionHandlesInvalidSqlTest")
.setBody(constant("SELECT INVALID SQL")) // parses, but
query fails to complete
-
.to("aws2-athena://label?operation=startQueryExecution&waitTimeout=60000&maxAttempts=3&retry=always&outputLocation="
- + s3Bucket + "&" + awsCreds);
+
.to("aws2-athena://label?operation=startQueryExecution&waitTimeout=60000&maxAttempts=3&retry=always&outputLocation="
+ s3Bucket + "&" + awsCreds);
from("direct:athenaStartQueryExecutionHandlesMalformedSqlTest")
.setBody(constant("MALFORMED SQL")) // unparseable by
athena
-
.to("aws2-athena://label?operation=startQueryExecution&waitTimeout=60000&maxAttempts=3&outputLocation="
- + s3Bucket + "&" + awsCreds);
+
.to("aws2-athena://label?operation=startQueryExecution&waitTimeout=60000&maxAttempts=3&outputLocation="
+ s3Bucket + "&" + awsCreds);
from("direct:athenaStartQueryExecutionTest")
.setBody(constant("SELECT 1"))
-
.to("aws2-athena://label?operation=startQueryExecution&outputLocation=" +
s3Bucket + "&"
- + awsCreds);
+
.to("aws2-athena://label?operation=startQueryExecution&outputLocation=" +
s3Bucket + "&" + awsCreds);
from("direct:athenaStartQueryExecutionAndGetQueryExecutionUsingHeaders")
.setBody(constant("SELECT 1"))
