You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2023/06/16 05:10:47 UTC
[camel] branch camel-3.x updated: Adjust code like on main branch
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch camel-3.x
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/camel-3.x by this push:
new 216a45826b5 Adjust code like on main branch
216a45826b5 is described below
commit 216a45826b57a019c7cfd08730096e0db29c758b
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Fri Jun 16 07:10:21 2023 +0200
Adjust code like on main branch
---
.../camel-dhis2/camel-dhis2-component/pom.xml | 5 +++
.../component/dhis2/AbstractDhis2TestSupport.java | 39 ++++++----------------
.../apache/camel/component/dhis2/Environment.java | 20 +++++------
.../src/test/resources/log4j2-test.xml | 36 --------------------
.../src/test/resources/log4j2.properties | 34 +++++++++++++++++++
5 files changed, 59 insertions(+), 75 deletions(-)
diff --git a/components/camel-dhis2/camel-dhis2-component/pom.xml b/components/camel-dhis2/camel-dhis2-component/pom.xml
index 111e8bfba3e..265d3faa728 100644
--- a/components/camel-dhis2/camel-dhis2-component/pom.xml
+++ b/components/camel-dhis2/camel-dhis2-component/pom.xml
@@ -62,6 +62,11 @@
<version>${testcontainers-version}</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-slf4j-impl</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>
diff --git a/components/camel-dhis2/camel-dhis2-component/src/test/java/org/apache/camel/component/dhis2/AbstractDhis2TestSupport.java b/components/camel-dhis2/camel-dhis2-component/src/test/java/org/apache/camel/component/dhis2/AbstractDhis2TestSupport.java
index e45d0423164..451308dd348 100644
--- a/components/camel-dhis2/camel-dhis2-component/src/test/java/org/apache/camel/component/dhis2/AbstractDhis2TestSupport.java
+++ b/components/camel-dhis2/camel-dhis2-component/src/test/java/org/apache/camel/component/dhis2/AbstractDhis2TestSupport.java
@@ -16,14 +16,10 @@
*/
package org.apache.camel.component.dhis2;
-import java.io.IOException;
-import java.util.HashMap;
import java.util.Map;
-import java.util.Properties;
import org.apache.camel.CamelContext;
import org.apache.camel.CamelExecutionException;
-import org.apache.camel.support.IntrospectionSupport;
import org.apache.camel.test.junit5.CamelTestSupport;
import org.junit.jupiter.api.TestInstance;
@@ -31,37 +27,22 @@ import org.junit.jupiter.api.TestInstance;
* Abstract base class for Dhis2 Integration tests generated by Camel API component maven plugin.
*/
@TestInstance(TestInstance.Lifecycle.PER_CLASS)
-public class AbstractDhis2TestSupport extends CamelTestSupport {
-
- private static final String TEST_OPTIONS_PROPERTIES = "/test-options.properties";
+abstract class AbstractDhis2TestSupport extends CamelTestSupport {
@Override
protected CamelContext createCamelContext()
throws Exception {
- final CamelContext context = super.createCamelContext();
-
- // read Dhis2 component configuration from TEST_OPTIONS_PROPERTIES
- final Properties properties = new Properties();
- try {
- properties.load(getClass().getResourceAsStream(TEST_OPTIONS_PROPERTIES));
- } catch (Exception e) {
- throw new IOException(
- String.format("%s could not be loaded: %s", TEST_OPTIONS_PROPERTIES, e.getMessage()),
- e);
- }
+ String baseApiUrl = "http://" + Environment.getDhis2Container().getHost() + ":" + Environment.getDhis2Container()
+ .getFirstMappedPort() + "/api";
+ String username = "admin";
+ String password = "district";
- properties.setProperty("baseApiUrl",
- "http://" + Environment.getDhis2Container().getHost() + ":" + Environment.getDhis2Container()
- .getFirstMappedPort() + "/api");
-
- Map<String, Object> options = new HashMap<>();
- for (Map.Entry<Object, Object> entry : properties.entrySet()) {
- options.put(entry.getKey().toString(), entry.getValue());
- }
-
- final Dhis2Configuration configuration = new Dhis2Configuration();
- IntrospectionSupport.setProperties(configuration, options);
+ final CamelContext context = super.createCamelContext();
+ Dhis2Configuration configuration = new Dhis2Configuration();
+ configuration.setBaseApiUrl(baseApiUrl);
+ configuration.setUsername(username);
+ configuration.setPassword(password);
// add Dhis2Component to Camel context
final Dhis2Component component = new Dhis2Component(context);
diff --git a/components/camel-dhis2/camel-dhis2-component/src/test/java/org/apache/camel/component/dhis2/Environment.java b/components/camel-dhis2/camel-dhis2-component/src/test/java/org/apache/camel/component/dhis2/Environment.java
index 31724fb8a72..625d1be0f36 100644
--- a/components/camel-dhis2/camel-dhis2-component/src/test/java/org/apache/camel/component/dhis2/Environment.java
+++ b/components/camel-dhis2/camel-dhis2-component/src/test/java/org/apache/camel/component/dhis2/Environment.java
@@ -51,21 +51,21 @@ public final class Environment {
static {
POSTGRESQL_CONTAINER = new PostgreSQLContainer<>(
DockerImageName.parse("postgis/postgis:12-3.2-alpine").asCompatibleSubstituteFor("postgres"))
- .withDatabaseName("dhis2")
- .withNetworkAliases("db")
- .withUsername("dhis")
- .withPassword("dhis").withNetwork(NETWORK);
+ .withDatabaseName("dhis2")
+ .withNetworkAliases("db")
+ .withUsername("dhis")
+ .withPassword("dhis").withNetwork(NETWORK);
POSTGRESQL_CONTAINER.start();
DHIS2_CONTAINER = new GenericContainer<>(
"dhis2/core:2.37.4-tomcat-8.5.34-jre8-alpine")
- .dependsOn(POSTGRESQL_CONTAINER)
- .withClasspathResourceMapping("dhis.conf", "/DHIS2_home/dhis.conf", BindMode.READ_ONLY)
- .withNetwork(NETWORK).withExposedPorts(8080)
- .waitingFor(
- new HttpWaitStrategy().forStatusCode(200).withStartupTimeout(Duration.ofSeconds(120)))
- .withEnv("WAIT_FOR_DB_CONTAINER", "db" + ":" + 5432 + " -t 0");
+ .dependsOn(POSTGRESQL_CONTAINER)
+ .withClasspathResourceMapping("dhis.conf", "/DHIS2_home/dhis.conf", BindMode.READ_ONLY)
+ .withNetwork(NETWORK).withExposedPorts(8080)
+ .waitingFor(
+ new HttpWaitStrategy().forStatusCode(200).withStartupTimeout(Duration.ofSeconds(360)))
+ .withEnv("WAIT_FOR_DB_CONTAINER", "db" + ":" + 5432 + " -t 0");
DHIS2_CONTAINER.start();
diff --git a/components/camel-dhis2/camel-dhis2-component/src/test/resources/log4j2-test.xml b/components/camel-dhis2/camel-dhis2-component/src/test/resources/log4j2-test.xml
deleted file mode 100644
index b09fd54e14a..00000000000
--- a/components/camel-dhis2/camel-dhis2-component/src/test/resources/log4j2-test.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!--
-
- 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.
-
--->
-<Configuration>
-
- <Appenders>
- <Console name="Console" target="SYSTEM_OUT">
- <PatternLayout pattern="[%30.30t] %-30.30c{1} %-5p %m%n"/>
- </Console>
- </Appenders>
-
- <Loggers>
- <Logger name="org.testcontainers" level="INFO" additivity="true"/>
-
- <Root level="info">
- <AppenderRef ref="Console"/>
- </Root>
- </Loggers>
-
-</Configuration>
diff --git a/components/camel-dhis2/camel-dhis2-component/src/test/resources/log4j2.properties b/components/camel-dhis2/camel-dhis2-component/src/test/resources/log4j2.properties
new file mode 100644
index 00000000000..d8f9763d3d7
--- /dev/null
+++ b/components/camel-dhis2/camel-dhis2-component/src/test/resources/log4j2.properties
@@ -0,0 +1,34 @@
+## ---------------------------------------------------------------------------
+## 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.
+## ---------------------------------------------------------------------------
+
+appender.file.type = File
+appender.file.name = file
+appender.file.fileName = target/camel-dhis2-test.log
+appender.file.layout.type = PatternLayout
+appender.file.layout.pattern = %d [%-15.15t] %-5p %-30.30c{1} - %m%n
+
+appender.out.type = Console
+appender.out.name = out
+appender.out.layout.type = PatternLayout
+appender.out.layout.pattern = [%30.30t] %-30.30c{1} %-5p %m%n
+
+rootLogger.level = INFO
+rootLogger.appenderRef.file.ref = file
+#rootLogger.appenderRef.out.ref = out
+
+#logger.camel-component.name = org.apache.camel.component.dhis2
+#logger.camel-component.level = DEBUG