You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ja...@apache.org on 2022/06/08 10:46:02 UTC

[camel-quarkus] branch main updated (242a068a5b -> 8f30224c33)

This is an automated email from the ASF dual-hosted git repository.

jamesnetherton pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git


    from 242a068a5b Auto discover routes created as LambdaEndpointRouteBuilder
     new ecbf637274 Remove redundant flat class path configuration from Cassandra tests
     new 8f30224c33 Remove redundant AwsS3PresignerProducer from AWS S3 tests

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../aws2-quarkus-client/aws2-s3/pom.xml            |  2 +-
 .../aws2/s3/it/AwsS3PresignerProducer.java         | 60 ----------------------
 .../aws2-quarkus-client-grouped/pom.xml            |  2 +-
 .../src/main/resources/application.properties      |  3 --
 4 files changed, 2 insertions(+), 65 deletions(-)
 delete mode 100644 integration-test-groups/aws2/aws2-s3/src/main/java/org/apache/camel/quarkus/component/aws2/s3/it/AwsS3PresignerProducer.java


[camel-quarkus] 01/02: Remove redundant flat class path configuration from Cassandra tests

Posted by ja...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

jamesnetherton pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git

commit ecbf6372746ec84337fc9e8dadcc63c878935910
Author: James Netherton <ja...@gmail.com>
AuthorDate: Wed Jun 8 08:55:24 2022 +0100

    Remove redundant flat class path configuration from Cassandra tests
    
    Fixes #3621
---
 .../cassandraql/src/main/resources/application.properties              | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/integration-tests/cassandraql/src/main/resources/application.properties b/integration-tests/cassandraql/src/main/resources/application.properties
index eb7da2838f..9f039d5715 100644
--- a/integration-tests/cassandraql/src/main/resources/application.properties
+++ b/integration-tests/cassandraql/src/main/resources/application.properties
@@ -15,8 +15,5 @@
 ## limitations under the License.
 ## ---------------------------------------------------------------------------
 
-# Required for the object serialization / deserialization logic in CassandraCamelCodec to work correctly under test
-quarkus.test.flat-class-path=true
-
 # Required for camel-cassandra AggregationStrategy
 quarkus.camel.native.reflection.serialization-enabled = true


[camel-quarkus] 02/02: Remove redundant AwsS3PresignerProducer from AWS S3 tests

Posted by ja...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

jamesnetherton pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git

commit 8f30224c330c6de01a432bffb309745688615cce
Author: James Netherton <ja...@gmail.com>
AuthorDate: Wed Jun 8 08:56:50 2022 +0100

    Remove redundant AwsS3PresignerProducer from AWS S3 tests
---
 .../aws2-quarkus-client/aws2-s3/pom.xml            |  2 +-
 .../aws2/s3/it/AwsS3PresignerProducer.java         | 60 ----------------------
 .../aws2-quarkus-client-grouped/pom.xml            |  2 +-
 3 files changed, 2 insertions(+), 62 deletions(-)

diff --git a/integration-test-groups/aws2-quarkus-client/aws2-s3/pom.xml b/integration-test-groups/aws2-quarkus-client/aws2-s3/pom.xml
index c7d8ab1ebe..1833401f93 100644
--- a/integration-test-groups/aws2-quarkus-client/aws2-s3/pom.xml
+++ b/integration-test-groups/aws2-quarkus-client/aws2-s3/pom.xml
@@ -122,7 +122,7 @@
                             <properties>
                                 <copy-tests.source.dir>${maven.multiModuleProjectDirectory}/integration-test-groups/aws2/aws2-s3</copy-tests.source.dir>
                                 <copy-tests.dest.module.dir>${project.basedir}</copy-tests.dest.module.dir>
-                                <copy-tests.excludes>**/*TestEnvCustomizer,**/*application.properties,**/*AwsS3PresignerProducer.java</copy-tests.excludes>
+                                <copy-tests.excludes>**/*TestEnvCustomizer,**/*application.properties</copy-tests.excludes>
                             </properties>
                         </configuration>
                     </execution>
diff --git a/integration-test-groups/aws2/aws2-s3/src/main/java/org/apache/camel/quarkus/component/aws2/s3/it/AwsS3PresignerProducer.java b/integration-test-groups/aws2/aws2-s3/src/main/java/org/apache/camel/quarkus/component/aws2/s3/it/AwsS3PresignerProducer.java
deleted file mode 100644
index a5b8fa852e..0000000000
--- a/integration-test-groups/aws2/aws2-s3/src/main/java/org/apache/camel/quarkus/component/aws2/s3/it/AwsS3PresignerProducer.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.quarkus.component.aws2.s3.it;
-
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.util.Optional;
-
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Singleton;
-
-import org.eclipse.microprofile.config.inject.ConfigProperty;
-import software.amazon.awssdk.auth.credentials.AwsBasicCredentials;
-import software.amazon.awssdk.auth.credentials.StaticCredentialsProvider;
-import software.amazon.awssdk.regions.Region;
-import software.amazon.awssdk.services.s3.internal.signing.DefaultS3Presigner;
-import software.amazon.awssdk.services.s3.presigner.S3Presigner;
-
-@ApplicationScoped
-public class AwsS3PresignerProducer {
-
-    @ConfigProperty(name = "camel.component.aws2-s3.uri-endpoint-override")
-    Optional<String> uriEndpointOverride;
-
-    @ConfigProperty(name = "camel.component.aws2-s3.region")
-    String region;
-
-    @ConfigProperty(name = "camel.component.aws2-s3.access-key")
-    String accessKey;
-
-    @ConfigProperty(name = "camel.component.aws2-s3.secret-key")
-    String secretKey;
-
-    @Singleton
-    public S3Presigner awsS3Presigner() throws URISyntaxException {
-        if (uriEndpointOverride.isPresent()) {
-            return DefaultS3Presigner.builder()
-                    .region(Region.of(region))
-                    .credentialsProvider(StaticCredentialsProvider.create(
-                            AwsBasicCredentials.create(accessKey, secretKey)))
-                    .endpointOverride(new URI(uriEndpointOverride.get()))
-                    .build();
-        }
-        return null;
-    }
-}
diff --git a/integration-tests/aws2-quarkus-client-grouped/pom.xml b/integration-tests/aws2-quarkus-client-grouped/pom.xml
index bdcf5c94d5..62714025e9 100644
--- a/integration-tests/aws2-quarkus-client-grouped/pom.xml
+++ b/integration-tests/aws2-quarkus-client-grouped/pom.xml
@@ -203,7 +203,7 @@
                             <properties>
                                 <copy-tests.source.dir>${maven.multiModuleProjectDirectory}/integration-test-groups/aws2/aws2-s3</copy-tests.source.dir>
                                 <copy-tests.dest.module.dir>${project.basedir}</copy-tests.dest.module.dir>
-                                <copy-tests.excludes>**/*TestEnvCustomizer,**/*application.properties,**/*AwsS3PresignerProducer.java</copy-tests.excludes>
+                                <copy-tests.excludes>**/*TestEnvCustomizer,**/*application.properties</copy-tests.excludes>
                             </properties>
                         </configuration>
                     </execution>