Skip to content

Remove usage of deprecated method #149

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
apupier merged 1 commit into from
Apr 17, 2025
Merged

Remove usage of deprecated method #149

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions ...afka-aws2-s3-restarting-policy/src/test/java/org/apache/camel/example/KafkaAwsS3Test.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
import org.apache.camel.test.infra.aws2.services.AWSServiceFactory;
import org.apache.camel.test.infra.kafka.services.KafkaService;
import org.apache.camel.test.infra.kafka.services.KafkaServiceFactory;
import org.apache.camel.test.junit5.CamelContextConfiguration;
import org.apache.camel.test.main.junit5.CamelMainTestSupport;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.RegisterExtension;
Expand All @@ -55,10 +56,10 @@ protected CamelContext createCamelContext() throws Exception {
}

@Override
protected Properties useOverridePropertiesWithPropertiesComponent() {
return asProperties(
"kafkaBrokers", KAFKA_SERVICE.getBootstrapServers()
);
public void configureContext(CamelContextConfiguration camelContextConfiguration) {
super.configureContext(camelContextConfiguration);
Properties overridenProperties = asProperties("kafkaBrokers", KAFKA_SERVICE.getBootstrapServers());
camelContextConfiguration.withUseOverridePropertiesWithPropertiesComponent(overridenProperties);
}

@Test
Expand Down
9 changes: 5 additions & 4 deletions ...main-endpointdsl-kafka-aws2-s3/src/test/java/org/apache/camel/example/KafkaAwsS3Test.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
import org.apache.camel.test.infra.aws2.services.AWSServiceFactory;
import org.apache.camel.test.infra.kafka.services.KafkaService;
import org.apache.camel.test.infra.kafka.services.KafkaServiceFactory;
import org.apache.camel.test.junit5.CamelContextConfiguration;
import org.apache.camel.test.main.junit5.CamelMainTestSupport;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.RegisterExtension;
Expand All @@ -55,10 +56,10 @@ protected CamelContext createCamelContext() throws Exception {
}

@Override
protected Properties useOverridePropertiesWithPropertiesComponent() {
return asProperties(
"kafkaBrokers", KAFKA_SERVICE.getBootstrapServers()
);
public void configureContext(CamelContextConfiguration camelContextConfiguration) {
super.configureContext(camelContextConfiguration);
Properties overridenProperties = asProperties("kafkaBrokers", KAFKA_SERVICE.getBootstrapServers());
camelContextConfiguration.withUseOverridePropertiesWithPropertiesComponent(overridenProperties);
}

@Test
Expand Down
18 changes: 10 additions & 8 deletions couchbase-log/src/test/java/org/apache/camel/example/CouchbaseTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@
import org.apache.camel.main.MainConfigurationProperties;
import org.apache.camel.test.infra.couchbase.services.CouchbaseService;
import org.apache.camel.test.infra.couchbase.services.CouchbaseServiceFactory;
import org.apache.camel.test.junit5.CamelContextConfiguration;
import org.apache.camel.test.main.junit5.CamelMainTestSupport;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll;
Expand Down Expand Up @@ -80,14 +81,15 @@ static void destroy() {
}

@Override
protected Properties useOverridePropertiesWithPropertiesComponent() {
return asProperties(
"couchbase.host", SERVICE.getHostname(),
"couchbase.port", Integer.toString(SERVICE.getPort()),
"couchbase.username", SERVICE.getUsername(),
"couchbase.password", SERVICE.getPassword(),
"couchbase.bucket", BUCKET
);
public void configureContext(CamelContextConfiguration camelContextConfiguration) {
super.configureContext(camelContextConfiguration);
Properties overridenProperties = asProperties(
"couchbase.host", SERVICE.getHostname(),
"couchbase.port", Integer.toString(SERVICE.getPort()),
"couchbase.username", SERVICE.getUsername(),
"couchbase.password", SERVICE.getPassword(),
"couchbase.bucket", BUCKET);
camelContextConfiguration.withUseOverridePropertiesWithPropertiesComponent(overridenProperties);
}

@Test
Expand Down
8 changes: 5 additions & 3 deletions csimple-joor/src/test/java/org/apache/camel/example/CSimpleJOORTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@

import org.apache.camel.builder.NotifyBuilder;
import org.apache.camel.main.MainConfigurationProperties;
import org.apache.camel.test.junit5.CamelContextConfiguration;
import org.apache.camel.test.main.junit5.CamelMainTestSupport;
import org.junit.jupiter.api.Test;

Expand All @@ -32,10 +33,11 @@
*/
class CSimpleJOORTest extends CamelMainTestSupport {


@Override
protected Properties useOverridePropertiesWithPropertiesComponent() {
return asProperties("myPeriod", Integer.toString(500));
public void configureContext(CamelContextConfiguration camelContextConfiguration) {
super.configureContext(camelContextConfiguration);
Properties overridenProperties = asProperties("myPeriod", Integer.toString(500));
camelContextConfiguration.withUseOverridePropertiesWithPropertiesComponent(overridenProperties);
}

@Test
Expand Down
7 changes: 5 additions & 2 deletions csimple/src/test/java/org/apache/camel/example/CSimpleTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@

import org.apache.camel.builder.NotifyBuilder;
import org.apache.camel.main.MainConfigurationProperties;
import org.apache.camel.test.junit5.CamelContextConfiguration;
import org.apache.camel.test.main.junit5.CamelMainTestSupport;
import org.junit.jupiter.api.Test;

Expand All @@ -33,8 +34,10 @@
class CSimpleTest extends CamelMainTestSupport {

@Override
protected Properties useOverridePropertiesWithPropertiesComponent() {
return asProperties("myPeriod", Integer.toString(500));
public void configureContext(CamelContextConfiguration camelContextConfiguration) {
super.configureContext(camelContextConfiguration);
Properties overridenProperties = asProperties("myPeriod", Integer.toString(500));
camelContextConfiguration.withUseOverridePropertiesWithPropertiesComponent(overridenProperties);
}

@Test
Expand Down
18 changes: 9 additions & 9 deletions debezium/src/test/java/org/apache/camel/example/debezium/DebeziumTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@
import org.apache.camel.test.infra.cassandra.services.CassandraServiceFactory;
import org.apache.camel.test.infra.postgres.services.PostgresLocalContainerService;
import org.apache.camel.test.infra.postgres.services.PostgresService;
import org.apache.camel.test.junit5.CamelContextConfiguration;
import org.apache.camel.test.main.junit5.CamelMainTestSupport;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
Expand Down Expand Up @@ -106,15 +107,14 @@ protected CamelContext createCamelContext() throws Exception {
}

@Override
protected Properties useOverridePropertiesWithPropertiesComponent() {
// Override the host and port of the broker
return asProperties(
"debezium.postgres.databaseHostName", POSTGRES_SERVICE.host(),
"debezium.postgres.databasePort", Integer.toString(POSTGRES_SERVICE.port()),
"debezium.postgres.databaseUser", SOURCE_DB_USERNAME,
"debezium.postgres.databasePassword", SOURCE_DB_PASSWORD,
"cassandra.node", String.format("%s:%d", CASSANDRA_SERVICE.getCassandraHost(), CASSANDRA_SERVICE.getCQL3Port())
);
public void configureContext(CamelContextConfiguration camelContextConfiguration) {
super.configureContext(camelContextConfiguration);
Properties overridenProperties = asProperties("debezium.postgres.databaseHostName", POSTGRES_SERVICE.host(),
"debezium.postgres.databasePort", Integer.toString(POSTGRES_SERVICE.port()),
"debezium.postgres.databaseUser", SOURCE_DB_USERNAME,
"debezium.postgres.databasePassword", SOURCE_DB_PASSWORD,
"cassandra.node", String.format("%s:%d", CASSANDRA_SERVICE.getCassandraHost(), CASSANDRA_SERVICE.getCQL3Port()));
camelContextConfiguration.withUseOverridePropertiesWithPropertiesComponent(overridenProperties);
}

@Test
Expand Down
14 changes: 8 additions & 6 deletions ftp/src/test/java/org/apache/camel/example/ftp/FtpTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@

import org.apache.camel.builder.NotifyBuilder;
import org.apache.camel.main.MainConfigurationProperties;
import org.apache.camel.test.junit5.CamelContextConfiguration;
import org.apache.camel.test.main.junit5.CamelMainTestSupport;
import org.apache.ftpserver.FtpServer;
import org.apache.ftpserver.FtpServerFactory;
Expand Down Expand Up @@ -87,12 +88,13 @@ static void destroy() {
}

@Override
protected Properties useOverridePropertiesWithPropertiesComponent() {
return asProperties(
"ftp.port", Integer.toString(PORT),
"ftp.username", "admin",
"ftp.password", "admin"
);
public void configureContext(CamelContextConfiguration camelContextConfiguration) {
super.configureContext(camelContextConfiguration);
Properties overridenProperties = asProperties(
"ftp.port", Integer.toString(PORT),
"ftp.username", "admin",
"ftp.password", "admin");
camelContextConfiguration.withUseOverridePropertiesWithPropertiesComponent(overridenProperties);
}

@Test
Expand Down
7 changes: 5 additions & 2 deletions main-endpointdsl/src/test/java/org/apache/camel/example/MainEndpointDSLTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@

import org.apache.camel.builder.NotifyBuilder;
import org.apache.camel.main.MainConfigurationProperties;
import org.apache.camel.test.junit5.CamelContextConfiguration;
import org.apache.camel.test.main.junit5.CamelMainTestSupport;
import org.junit.jupiter.api.Test;

Expand All @@ -33,8 +34,10 @@
class MainEndpointDSLTest extends CamelMainTestSupport {

@Override
protected Properties useOverridePropertiesWithPropertiesComponent() {
return asProperties("myPeriod", Integer.toString(500));
public void configureContext(CamelContextConfiguration camelContextConfiguration) {
super.configureContext(camelContextConfiguration);
Properties overridenProperties = asProperties("myPeriod", Integer.toString(500));
camelContextConfiguration.withUseOverridePropertiesWithPropertiesComponent(overridenProperties);
}

@Test
Expand Down
7 changes: 5 additions & 2 deletions main-health/src/test/java/org/apache/camel/example/MainHealthTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@

import org.apache.camel.builder.NotifyBuilder;
import org.apache.camel.main.MainConfigurationProperties;
import org.apache.camel.test.junit5.CamelContextConfiguration;
import org.apache.camel.test.main.junit5.CamelMainTestSupport;
import org.junit.jupiter.api.Test;

Expand All @@ -33,8 +34,10 @@
class MainHealthTest extends CamelMainTestSupport {

@Override
protected Properties useOverridePropertiesWithPropertiesComponent() {
return asProperties("myPeriod", Integer.toString(500));
public void configureContext(CamelContextConfiguration camelContextConfiguration) {
super.configureContext(camelContextConfiguration);
Properties overridenProperties = asProperties("myPeriod", Integer.toString(500));
camelContextConfiguration.withUseOverridePropertiesWithPropertiesComponent(overridenProperties);
}

@Override
Expand Down
7 changes: 5 additions & 2 deletions main-joor/src/test/java/org/apache/camel/example/MainJOORTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@

import org.apache.camel.builder.NotifyBuilder;
import org.apache.camel.main.MainConfigurationProperties;
import org.apache.camel.test.junit5.CamelContextConfiguration;
import org.apache.camel.test.main.junit5.CamelMainTestSupport;
import org.junit.jupiter.api.Test;

Expand All @@ -33,8 +34,10 @@
class MainJOORTest extends CamelMainTestSupport {

@Override
protected Properties useOverridePropertiesWithPropertiesComponent() {
return asProperties("myPeriod", Integer.toString(500));
public void configureContext(CamelContextConfiguration camelContextConfiguration) {
super.configureContext(camelContextConfiguration);
Properties overridenProperties = asProperties("myPeriod", Integer.toString(500));
camelContextConfiguration.withUseOverridePropertiesWithPropertiesComponent(overridenProperties);
}

@Test
Expand Down
7 changes: 5 additions & 2 deletions main-tiny/src/test/java/org/apache/camel/example/MainTinyTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@

import org.apache.camel.builder.NotifyBuilder;
import org.apache.camel.main.MainConfigurationProperties;
import org.apache.camel.test.junit5.CamelContextConfiguration;
import org.apache.camel.test.main.junit5.CamelMainTestSupport;
import org.junit.jupiter.api.Test;

Expand All @@ -33,8 +34,10 @@
class MainTinyTest extends CamelMainTestSupport {

@Override
protected Properties useOverridePropertiesWithPropertiesComponent() {
return asProperties("myPeriod", Integer.toString(500));
public void configureContext(CamelContextConfiguration camelContextConfiguration) {
super.configureContext(camelContextConfiguration);
Properties overridenProperties = asProperties("myPeriod", Integer.toString(500));
camelContextConfiguration.withUseOverridePropertiesWithPropertiesComponent(overridenProperties);
}

@Test
Expand Down