This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel.git
commit 46514f38da227085894a7e80fcddc3577f8a0fa5 Author: Claus Ibsen <[email protected]> AuthorDate: Tue Feb 28 14:29:02 2023 +0100 CAMEL-19090: Remove deprecated apis in core --- .../component/dhis2/AbstractDhis2TestSupport.java | 39 ++++++---------------- .../src/test/resources/test-options.properties | 18 ---------- 2 files changed, 10 insertions(+), 47 deletions(-) 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/resources/test-options.properties b/components/camel-dhis2/camel-dhis2-component/src/test/resources/test-options.properties deleted file mode 100644 index 55e7d53a582..00000000000 --- a/components/camel-dhis2/camel-dhis2-component/src/test/resources/test-options.properties +++ /dev/null @@ -1,18 +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. -## --------------------------------------------------------------------------- -username=admin -password=district
