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/02/28 13:32:37 UTC
[camel] branch main updated (04b257c7b7c -> 847be2d1c51)
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
from 04b257c7b7c CAMEL-19090: Remove deprecated apis in core
new 46514f38da2 CAMEL-19090: Remove deprecated apis in core
new 847be2d1c51 Polished
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:
components/camel-dhis2/camel-dhis2-api/pom.xml | 5 ++-
.../services/org/apache/camel/other.properties | 2 +-
.../src/generated/resources/dhis2-api.json | 2 +-
.../org/apache/camel/component/dhis2/dhis2.json | 2 +-
.../src/main/docs/dhis2-component.adoc | 2 +-
.../camel/component/dhis2/Dhis2Endpoint.java | 2 +-
.../component/dhis2/AbstractDhis2TestSupport.java | 39 ++++++----------------
.../src/test/resources/test-options.properties | 18 ----------
8 files changed, 17 insertions(+), 55 deletions(-)
delete mode 100644 components/camel-dhis2/camel-dhis2-component/src/test/resources/test-options.properties
[camel] 01/02: CAMEL-19090: Remove deprecated apis in core
Posted by da...@apache.org.
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 <cl...@gmail.com>
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
[camel] 02/02: Polished
Posted by da...@apache.org.
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 847be2d1c51e25a6207baef8b50cd66e85f6435a
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Tue Feb 28 14:32:26 2023 +0100
Polished
---
components/camel-dhis2/camel-dhis2-api/pom.xml | 5 ++---
.../resources/META-INF/services/org/apache/camel/other.properties | 2 +-
.../camel-dhis2-api/src/generated/resources/dhis2-api.json | 2 +-
.../generated/resources/org/apache/camel/component/dhis2/dhis2.json | 2 +-
.../camel-dhis2-component/src/main/docs/dhis2-component.adoc | 2 +-
.../main/java/org/apache/camel/component/dhis2/Dhis2Endpoint.java | 2 +-
6 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/components/camel-dhis2/camel-dhis2-api/pom.xml b/components/camel-dhis2/camel-dhis2-api/pom.xml
index 25c01344cfb..5f0cd15f33f 100644
--- a/components/camel-dhis2/camel-dhis2-api/pom.xml
+++ b/components/camel-dhis2/camel-dhis2-api/pom.xml
@@ -29,12 +29,12 @@
</parent>
<artifactId>camel-dhis2-api</artifactId>
- <name>Camel DHIS2 API</name>
+ <name>Camel :: DHIS2 API</name>
<description>Camel DHIS2 API</description>
<packaging>jar</packaging>
<properties>
- <firstVersion>4.0.0-SNAPSHOT</firstVersion>
+ <firstVersion>4.0.0</firstVersion>
</properties>
<build>
@@ -61,7 +61,6 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-junit-jupiter</artifactId>
- <version>4.6.1</version>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/components/camel-dhis2/camel-dhis2-api/src/generated/resources/META-INF/services/org/apache/camel/other.properties b/components/camel-dhis2/camel-dhis2-api/src/generated/resources/META-INF/services/org/apache/camel/other.properties
index 70813d8db74..6ffbb4c5259 100644
--- a/components/camel-dhis2/camel-dhis2-api/src/generated/resources/META-INF/services/org/apache/camel/other.properties
+++ b/components/camel-dhis2/camel-dhis2-api/src/generated/resources/META-INF/services/org/apache/camel/other.properties
@@ -3,5 +3,5 @@ name=dhis2-api
groupId=org.apache.camel
artifactId=camel-dhis2-api
version=4.0.0-SNAPSHOT
-projectName=Camel DHIS2 API
+projectName=Camel :: DHIS2 API
projectDescription=Camel DHIS2 API
diff --git a/components/camel-dhis2/camel-dhis2-api/src/generated/resources/dhis2-api.json b/components/camel-dhis2/camel-dhis2-api/src/generated/resources/dhis2-api.json
index 860ee634c20..8926a7abef9 100644
--- a/components/camel-dhis2/camel-dhis2-api/src/generated/resources/dhis2-api.json
+++ b/components/camel-dhis2/camel-dhis2-api/src/generated/resources/dhis2-api.json
@@ -5,7 +5,7 @@
"title": "Dhis2 Api",
"description": "Camel DHIS2 API",
"deprecated": false,
- "firstVersion": "4.0.0-SNAPSHOT",
+ "firstVersion": "4.0.0",
"supportLevel": "Preview",
"groupId": "org.apache.camel",
"artifactId": "camel-dhis2-api",
diff --git a/components/camel-dhis2/camel-dhis2-component/src/generated/resources/org/apache/camel/component/dhis2/dhis2.json b/components/camel-dhis2/camel-dhis2-component/src/generated/resources/org/apache/camel/component/dhis2/dhis2.json
index 256c2bd9c84..6f2feb00021 100644
--- a/components/camel-dhis2/camel-dhis2-component/src/generated/resources/org/apache/camel/component/dhis2/dhis2.json
+++ b/components/camel-dhis2/camel-dhis2-component/src/generated/resources/org/apache/camel/component/dhis2/dhis2.json
@@ -5,7 +5,7 @@
"title": "DHIS2",
"description": "Leverages the DHIS2 Java SDK to integrate Apache Camel with the DHIS2 Web API.",
"deprecated": false,
- "firstVersion": "4.0.0-SNAPSHOT",
+ "firstVersion": "4.0.0",
"label": "api",
"javaType": "org.apache.camel.component.dhis2.Dhis2Component",
"supportLevel": "Preview",
diff --git a/components/camel-dhis2/camel-dhis2-component/src/main/docs/dhis2-component.adoc b/components/camel-dhis2/camel-dhis2-component/src/main/docs/dhis2-component.adoc
index 7bf53d55f10..b5d939160d2 100644
--- a/components/camel-dhis2/camel-dhis2-component/src/main/docs/dhis2-component.adoc
+++ b/components/camel-dhis2/camel-dhis2-component/src/main/docs/dhis2-component.adoc
@@ -3,7 +3,7 @@
:shortname: dhis2
:artifactid: camel-dhis2
:description: Leverages the DHIS2 Java SDK to integrate Apache Camel with the DHIS2 Web API.
-:since: 4.0.0-SNAPSHOT
+:since: 4.0
:supportlevel: Preview
:component-header: Both producer and consumer are supported
diff --git a/components/camel-dhis2/camel-dhis2-component/src/main/java/org/apache/camel/component/dhis2/Dhis2Endpoint.java b/components/camel-dhis2/camel-dhis2-component/src/main/java/org/apache/camel/component/dhis2/Dhis2Endpoint.java
index 40e025461e6..e6dbbad1381 100644
--- a/components/camel-dhis2/camel-dhis2-component/src/main/java/org/apache/camel/component/dhis2/Dhis2Endpoint.java
+++ b/components/camel-dhis2/camel-dhis2-component/src/main/java/org/apache/camel/component/dhis2/Dhis2Endpoint.java
@@ -40,7 +40,7 @@ import org.hisp.dhis.integration.sdk.api.Dhis2Client;
* Leverages the DHIS2 Java SDK to integrate Apache Camel with the DHIS2 Web API.
* <p>
*/
-@UriEndpoint(firstVersion = "4.0.0-SNAPSHOT", scheme = "dhis2", title = "DHIS2", syntax = "dhis2:methodName",
+@UriEndpoint(firstVersion = "4.0.0", scheme = "dhis2", title = "DHIS2", syntax = "dhis2:methodName",
apiSyntax = "apiName/methodName", category = {
Category.API })
public class Dhis2Endpoint extends AbstractApiEndpoint<Dhis2ApiName, Dhis2Configuration> {