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
The following commit(s) were added to refs/heads/main by this push:
new 1a95c39 Ensure camel-quarkus-integration-wiremock-support is test
scope
1a95c39 is described below
commit 1a95c39423ac538e59ed1130fec2d113effb17b0
Author: James Netherton <[email protected]>
AuthorDate: Tue May 25 07:25:26 2021 +0100
Ensure camel-quarkus-integration-wiremock-support is test scope
---
integration-tests/digitalocean/pom.xml | 1 +
.../digitalocean/it/DigitalOceanClientMock.java | 21 +++++++++++++++++++--
.../digitalocean/it/DigitaloceanRoute.java | 2 +-
.../component/digitalocean/it/MockApiService.java | 5 ++---
.../digitalocean/it/DigitaloceanTestResource.java | 7 -------
integration-tests/geocoder/pom.xml | 5 +----
integration-tests/slack/pom.xml | 1 +
7 files changed, 25 insertions(+), 17 deletions(-)
diff --git a/integration-tests/digitalocean/pom.xml
b/integration-tests/digitalocean/pom.xml
index 0867acc..4c7d302 100644
--- a/integration-tests/digitalocean/pom.xml
+++ b/integration-tests/digitalocean/pom.xml
@@ -80,6 +80,7 @@
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
<artifactId>camel-quarkus-integration-wiremock-support</artifactId>
+ <scope>test</scope>
</dependency>
<!-- The following dependencies guarantee that this module is built
after them. You can update them by running `mvn process-resources -Pformat -N`
from the source tree root directory -->
diff --git
a/integration-tests/digitalocean/src/main/java/org/apache/camel/quarkus/component/digitalocean/it/DigitalOceanClientMock.java
b/integration-tests/digitalocean/src/main/java/org/apache/camel/quarkus/component/digitalocean/it/DigitalOceanClientMock.java
index 462799f..3e206d2 100644
---
a/integration-tests/digitalocean/src/main/java/org/apache/camel/quarkus/component/digitalocean/it/DigitalOceanClientMock.java
+++
b/integration-tests/digitalocean/src/main/java/org/apache/camel/quarkus/component/digitalocean/it/DigitalOceanClientMock.java
@@ -16,15 +16,32 @@
*/
package org.apache.camel.quarkus.component.digitalocean.it;
-import com.github.tomakehurst.wiremock.http.HttpClientFactory;
import com.myjeeva.digitalocean.impl.DigitalOceanClient;
+import org.apache.http.HttpException;
+import org.apache.http.HttpHost;
+import org.apache.http.HttpRequest;
+import org.apache.http.conn.routing.HttpRoute;
+import org.apache.http.impl.client.HttpClients;
+import org.apache.http.impl.conn.DefaultRoutePlanner;
+import org.apache.http.impl.conn.DefaultSchemePortResolver;
+import org.apache.http.protocol.HttpContext;
public class DigitalOceanClientMock extends DigitalOceanClient {
public DigitalOceanClientMock(String authToken, String apiHost) {
super(authToken);
this.apiHost = apiHost;
- this.httpClient = HttpClientFactory.createClient();
+ this.httpClient = HttpClients.custom()
+ .setRoutePlanner(new
DefaultRoutePlanner(DefaultSchemePortResolver.INSTANCE) {
+ @Override
+ public HttpRoute determineRoute(HttpHost host, HttpRequest
request, HttpContext context)
+ throws HttpException {
+ // Override DigitalOceanClient forcing HTTPS
+ HttpHost httpSchemeHost = new
HttpHost(host.getHostName(), host.getPort(), "http");
+ return super.determineRoute(httpSchemeHost, request,
context);
+ }
+ })
+ .build();
}
}
diff --git
a/integration-tests/digitalocean/src/main/java/org/apache/camel/quarkus/component/digitalocean/it/DigitaloceanRoute.java
b/integration-tests/digitalocean/src/main/java/org/apache/camel/quarkus/component/digitalocean/it/DigitaloceanRoute.java
index e90a1cf..60855db 100644
---
a/integration-tests/digitalocean/src/main/java/org/apache/camel/quarkus/component/digitalocean/it/DigitaloceanRoute.java
+++
b/integration-tests/digitalocean/src/main/java/org/apache/camel/quarkus/component/digitalocean/it/DigitaloceanRoute.java
@@ -44,7 +44,7 @@ public class DigitaloceanRoute extends RouteBuilder {
@Unremovable
@Named("digitalOceanClient")
DigitalOceanClient initDigitalOceanClient(MockApiService mockApiService) {
- Optional<String> wireMockUrl =
ConfigProvider.getConfig().getOptionalValue("wiremock.url.ssl", String.class);
+ Optional<String> wireMockUrl =
ConfigProvider.getConfig().getOptionalValue("wiremock.url", String.class);
if (wireMockUrl.isPresent()) {
return mockApiService.createDigitalOceanClient(wireMockUrl.get(),
oAuthToken);
}
diff --git
a/integration-tests/digitalocean/src/main/java/org/apache/camel/quarkus/component/digitalocean/it/MockApiService.java
b/integration-tests/digitalocean/src/main/java/org/apache/camel/quarkus/component/digitalocean/it/MockApiService.java
index 1aee355..544b872 100644
---
a/integration-tests/digitalocean/src/main/java/org/apache/camel/quarkus/component/digitalocean/it/MockApiService.java
+++
b/integration-tests/digitalocean/src/main/java/org/apache/camel/quarkus/component/digitalocean/it/MockApiService.java
@@ -24,11 +24,10 @@ import com.myjeeva.digitalocean.impl.DigitalOceanClient;
public class MockApiService {
public DigitalOceanClient createDigitalOceanClient(String wireMockUrl,
String oAuthToken) {
- DigitalOceanClientMock digitalOceanClient = new
DigitalOceanClientMock(oAuthToken, getFormattedURI(wireMockUrl));
- return digitalOceanClient;
+ return new DigitalOceanClientMock(oAuthToken,
getFormattedURI(wireMockUrl));
}
String getFormattedURI(String wireMockUrl) {
- return wireMockUrl.replaceAll("https://";, "");
+ return wireMockUrl.replaceAll("http://";, "");
}
}
diff --git
a/integration-tests/digitalocean/src/test/java/org/apache/camel/quarkus/component/digitalocean/it/DigitaloceanTestResource.java
b/integration-tests/digitalocean/src/test/java/org/apache/camel/quarkus/component/digitalocean/it/DigitaloceanTestResource.java
index 7e31a36..e67402e 100644
---
a/integration-tests/digitalocean/src/test/java/org/apache/camel/quarkus/component/digitalocean/it/DigitaloceanTestResource.java
+++
b/integration-tests/digitalocean/src/test/java/org/apache/camel/quarkus/component/digitalocean/it/DigitaloceanTestResource.java
@@ -16,7 +16,6 @@
*/
package org.apache.camel.quarkus.component.digitalocean.it;
-import com.github.tomakehurst.wiremock.core.WireMockConfiguration;
import
org.apache.camel.quarkus.test.wiremock.WireMockTestResourceLifecycleManager;
public class DigitaloceanTestResource extends
WireMockTestResourceLifecycleManager {
@@ -33,10 +32,4 @@ public class DigitaloceanTestResource extends
WireMockTestResourceLifecycleManag
protected boolean isMockingEnabled() {
return !envVarsPresent(DIGITALOCEAN_AUTH_TOKEN,
DIGITALOCEAN_PUBLIC_KEY);
}
-
- @Override
- protected void customizeWiremockConfiguration(WireMockConfiguration
config) {
- // add an SSL port
- config.dynamicHttpsPort();
- }
}
diff --git a/integration-tests/geocoder/pom.xml
b/integration-tests/geocoder/pom.xml
index 115288e..c362f60 100644
--- a/integration-tests/geocoder/pom.xml
+++ b/integration-tests/geocoder/pom.xml
@@ -58,11 +58,8 @@
<!-- dependencies needed to mock Google maps API -->
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
- <artifactId>camel-quarkus-platform-http</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.camel.quarkus</groupId>
<artifactId>camel-quarkus-integration-wiremock-support</artifactId>
+ <scope>test</scope>
</dependency>
diff --git a/integration-tests/slack/pom.xml b/integration-tests/slack/pom.xml
index 5dc4456..7df2969 100644
--- a/integration-tests/slack/pom.xml
+++ b/integration-tests/slack/pom.xml
@@ -58,6 +58,7 @@
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
<artifactId>camel-quarkus-integration-wiremock-support</artifactId>
+ <scope>test</scope>
</dependency>
<!-- The following dependencies guarantee that this module is built
after them. You can update them by running `mvn process-resources -Pformat -N`
from the source tree root directory -->
