Merge branch 'REFACTORE' into camel-ftp-integration-test-updated

Talend · Apr 29, 2024 · d1f8eb8 · d1f8eb8
2 parents 6e233e6 + 81ea53d
commit d1f8eb8
Show file tree

Hide file tree

Showing 6 changed files with 60 additions and 8 deletions.
diff --git a/components/camel-google/camel-google-functions/pom.xml b/components/camel-google/camel-google-functions/pom.xml
@@ -37,6 +37,7 @@
             org.apache.camel*;version=${camel.version}
         </camel.osgi.export>
         <camel.osgi.import>
+            com.google.common*;version="[33,34)",
             *
         </camel.osgi.import>
     </properties>

diff --git a/components/camel-google/camel-google-mail/pom.xml b/components/camel-google/camel-google-mail/pom.xml
@@ -37,6 +37,7 @@
             org.apache.camel*;version=${camel.version}
         </camel.osgi.export>
         <camel.osgi.import>
+            com.google.common.base*;version="[33,34)",
             *
         </camel.osgi.import>
     </properties>

diff --git a/features/src/main/feature/camel-features.xml b/features/src/main/feature/camel-features.xml
@@ -938,6 +938,20 @@
         <bundle dependency='true'>wrap:mvn:com.google.cloud/google-cloud-bigquery/2.38.1</bundle>
         <bundle>mvn:org.apache.camel.karaf/camel-google-bigquery/${project.version}</bundle>
     </feature>
+    <feature name='camel-google-functions' version='${project.version}' start-level='50'>
+        <feature version='${camel.osgi.version.range}'>camel-core</feature>
+        <feature version="[33,34)">guava</feature>
+        <feature version='[4,5)'>http-client</feature>
+        <bundle dependency='true'>wrap:mvn:com.google.http-client/google-http-client/${google-cloud-http-client-version}$overwrite=merge&amp;Import-Package=com.google.common*;version="[33,34)",*</bundle>
+        <bundle dependency='true'>wrap:mvn:com.google.api/gax/2.45.0</bundle>
+        <bundle dependency='true'>wrap:mvn:com.google.auth/google-auth-library-oauth2-http/${grpc-google-auth-library-version}</bundle>
+        <bundle dependency='true'>wrap:mvn:com.google.auth/google-auth-library-credentials/${grpc-google-auth-library-version}</bundle>
+        <bundle dependency='true'>wrap:mvn:com.google.cloud/google-cloud-functions/${google-cloud-functions-bom-version}</bundle>
+        <bundle dependency='true'>mvn:com.google.protobuf/protobuf-java/${protobuf-version}</bundle>
+        <bundle dependency='true'>wrap:mvn:io.opencensus/opencensus-api/0.31.1</bundle>
+        <bundle dependency='true'>wrap:mvn:io.opencensus/opencensus-contrib-http-util/0.31.1</bundle>
+        <bundle>mvn:org.apache.camel.karaf/camel-google-functions/${project.version}</bundle>
+    </feature>
     <feature name='camel-google-calendar' version='${project.version}' start-level='50'>
         <feature version='${camel.osgi.version.range}'>camel-core</feature>
         <feature version="[33,34)">guava</feature>
@@ -955,6 +969,43 @@
         <bundle dependency='true'>wrap:mvn:com.google.apis/google-api-services-calendar/${google-api-services-calendar-version}</bundle>
         <bundle>mvn:org.apache.camel.karaf/camel-google-calendar/${project.version}</bundle>
     </feature>
+    <feature name='camel-google-drive' version='${project.version}' start-level='50'>
+        <feature version='${camel.osgi.version.range}'>camel-core</feature>
+        <feature version='[33,34)'>guava</feature>
+        <feature version='[4,5)'>http-client</feature>
+        <bundle dependency='true'>wrap:mvn:com.google.api-client/google-api-client/${google-api-client-version}$overwrite=merge&amp;Import-Package=com.google.common*;version="[33,34)",*</bundle>
+        <bundle dependency='true'>wrap:mvn:com.google.apis/google-api-services-drive/${google-api-services-drive-version}</bundle>
+        <bundle dependency='true'>wrap:mvn:com.google.auth/google-auth-library-oauth2-http/${grpc-google-auth-library-version}</bundle>
+        <bundle dependency='true'>wrap:mvn:com.google.auth/google-auth-library-credentials/${grpc-google-auth-library-version}</bundle>
+        <bundle dependency='true'>mvn:com.google.code.gson/gson/${gson-version}</bundle>
+        <bundle dependency='true'>wrap:mvn:com.google.http-client/google-http-client/${google-cloud-http-client-version}$overwrite=merge&amp;Import-Package=com.google.common*;version="[33,34)",*</bundle>
+        <bundle dependency='true'>mvn:com.google.http-client/google-http-client-apache-v2/${google-cloud-http-client-version}</bundle>
+        <bundle dependency='true'>wrap:mvn:com.google.http-client/google-http-client-gson/${google-cloud-http-client-version}</bundle>
+        <bundle dependency='true'>wrap:mvn:com.google.http-client/google-http-client-jackson2/${google-cloud-http-client-version}</bundle>
+        <bundle dependency='true'>mvn:com.google.oauth-client/google-oauth-client-java6/${google-oauth-client-version}</bundle>
+        <bundle dependency='true'>wrap:mvn:com.google.oauth-client/google-oauth-client/${google-oauth-client-version}$overwrite=merge&amp;Import-Package=com.google.common*;version="[33,34)",*</bundle>
+        <bundle dependency='true'>wrap:mvn:com.google.oauth-client/google-oauth-client-jetty/${google-oauth-client-version}$overwrite=merge&amp;Import-Package=com.sun.net.httpserver;resolution:=optional,*</bundle>
+        <bundle dependency='true'>wrap:mvn:io.opencensus/opencensus-api/0.31.1</bundle>
+        <bundle dependency='true'>wrap:mvn:io.opencensus/opencensus-contrib-http-util/0.31.1</bundle>
+        <bundle>mvn:org.apache.camel.karaf/camel-google-drive/${project.version}</bundle>
+    </feature>
+    <feature name='camel-google-mail' version='${project.version}' start-level='50'>
+        <feature version='${camel.osgi.version.range}'>camel-core</feature>
+        <feature version='[33,34)'>guava</feature>
+        <feature version='[4,5)'>http-client</feature>
+        <bundle dependency='true'>mvn:com.google.api-client/google-api-client/${google-api-client-version}</bundle>
+        <bundle dependency='true'>wrap:mvn:com.google.http-client/google-http-client/${google-cloud-http-client-version}$overwrite=merge&amp;Import-Package=com.google.common.base;version="[33,34)",*</bundle>
+        <bundle dependency='true'>wrap:mvn:com.google.oauth-client/google-oauth-client/${google-oauth-client-version}$overwrite=merge&amp;Import-Package=com.google.common*;version="[33,34)",*</bundle>
+        <bundle dependency='true'>wrap:mvn:com.google.auth/google-auth-library-credentials/${google-auth-library-oauth2-http-version}</bundle>
+        <bundle dependency='true'>wrap:mvn:com.google.auth/google-auth-library-oauth2-http/${google-auth-library-oauth2-http-version}</bundle>
+        <bundle dependency='true'>wrap:mvn:io.opencensus/opencensus-api/0.31.1</bundle>
+        <bundle dependency='true'>wrap:mvn:io.opencensus/opencensus-contrib-http-util/0.31.1</bundle>
+        <bundle dependency='true'>wrap:mvn:com.google.http-client/google-http-client-gson/${google-cloud-http-client-version}</bundle>
+        <bundle dependency='true'>wrap:mvn:com.google.http-client/google-http-client-apache-v2/${google-cloud-http-client-version}</bundle>
+        <bundle dependency='true'>wrap:mvn:com.google.http-client/google-http-client-jackson2/${google-cloud-http-client-version}</bundle>
+        <bundle dependency='true'>wrap:mvn:com.google.apis/google-api-services-gmail/${google-api-services-mail-version}</bundle>
+        <bundle>mvn:org.apache.camel.karaf/camel-google-mail/${project.version}</bundle>
+     </feature>
     <feature name='camel-google-pubsub' version='${project.version}' start-level='50'>
         <feature version='${camel.osgi.version.range}'>camel-core</feature>
         <feature version="[32,33)">guava</feature>
@@ -1170,7 +1221,7 @@
     </feature>
     <feature name='camel-jira' version='${project.version}' start-level='50'>
         <feature version='${camel.osgi.version.range}'>camel-core</feature>
-        <feature version='[33,34)'>guava</feature>
+        <feature version='[30.1,31)'>guava</feature>
         <feature version='[4,5)'>http-client</feature>
         <bundle dependency='true'>wrap:mvn:com.atlassian.event/atlassian-event/4.1.3</bundle>
         <bundle dependency='true'>wrap:mvn:com.atlassian.httpclient/atlassian-httpclient-library/2.1.5</bundle>

diff --git a/tests/camel-integration-test/pom.xml b/tests/camel-integration-test/pom.xml
@@ -94,6 +94,7 @@
                             org.apache.karaf.features,
                             org.osgi.service.*,
                             org.awaitility*,
+                            org.ops4j.pax.swissbox.tracker,
                             org.slf4j*,
                             javax.net,
                             javax.net.ssl*,

diff --git a/...integration-test/src/main/java/org/apache/karaf/camel/itests/AbstractCamelKarafITest.java b/...integration-test/src/main/java/org/apache/karaf/camel/itests/AbstractCamelKarafITest.java
@@ -20,6 +20,7 @@
 import org.apache.camel.ProducerTemplate;
 import org.junit.After;
 import org.junit.Before;
+import org.ops4j.pax.swissbox.tracker.ServiceLookup;
 import org.osgi.framework.Bundle;
 
 import java.net.InetAddress;
@@ -109,7 +110,7 @@ protected void installRequiredFeatures() throws Exception {
     }
 
     private void initCamelContext() {
-        this.context = bundleContext.getService(bundleContext.getServiceReference(CamelContext.class));
+        this.context = ServiceLookup.getService(bundleContext, CamelContext.class);
     }
 
     private void initProducerTemplate() {

diff --git a/...components/camel-jetty/src/main/java/org/apache/karaf/camel/test/CamelJettyComponent.java b/...components/camel-jetty/src/main/java/org/apache/karaf/camel/test/CamelJettyComponent.java
@@ -38,7 +38,7 @@ public class CamelJettyComponent extends AbstractCamelComponentResultMockBased {
 
     @Override
     protected Function<RouteBuilder, RouteDefinition> consumerRoute() {
-        return builder -> builder.from("jetty://http://localhost:%s/test".formatted(port)).transform(builder.constant("OK"));
+        return builder -> builder.from("jetty://http://localhost:%s/jettyTest".formatted(port)).transform(builder.constant("OK"));
     }
 
     @Override
@@ -55,16 +55,13 @@ public void process(Exchange exchange) throws Exception {
             HttpClient client = HttpClient.newHttpClient();
 
             // Create a URI for the request
-            URI uri = URI.create("http://localhost:%s/test".formatted(port));
+            URI uri = URI.create("http://localhost:%s/jettyTest".formatted(port));
 
             // Create a HttpRequest
             HttpRequest request = HttpRequest.newBuilder()
                     .uri(uri)
                     .build();
-
-            client.sendAsync(request, HttpResponse.BodyHandlers.ofString())
-                    .thenApply(HttpResponse::body)
-                    .thenAccept(System.out::println);
+            client.send(request, HttpResponse.BodyHandlers.ofString());
         }
     }
 }