This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 317fc854905d29a4c394ba190cd2467148f878a0
Author: Otavio Rodolfo Piske <angusyo...@gmail.com>
AuthorDate: Wed May 22 12:32:02 2024 +0200
CAMEL-20785: lock-down class-level utility methods
Also fixes a lot of unnecessary abuses on the API
---
.../camel/component/cxf/CXFWsdlOnlyTest.java | 7 ----
.../camel/component/cxf/CxfNonWrapperTest.java | 7 ----
.../infinispan/InfinispanConsumerTestSupport.java | 3 --
.../InfinispanIdempotentRepositoryTestSupport.java | 6 +---
.../embedded/InfinispanEmbeddedConsumerTest.java | 5 ---
.../InfinispanEmbeddedCustomListenerTest.java | 5 ---
...InfinispanEmbeddedIdempotentRepositoryTest.java | 13 +++++---
.../remote/InfinispanRemoteConsumerIT.java | 5 ---
.../remote/InfinispanRemoteCustomListenerIT.java | 5 ---
.../InfinispanRemoteIdempotentRepositoryIT.java | 13 +++++---
.../camel/component/mail/MailComponentTest.java | 37 +++++++++++-----------
.../camel/component/mail/MailMessageTest.java | 5 ++-
.../quartz/QuartzEndpointConfigureTest.java | 21 ++++++------
.../apache/camel/test/junit5/CamelTestSupport.java | 28 ++++++++--------
14 files changed, 61 insertions(+), 99 deletions(-)
diff --git
a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CXFWsdlOnlyTest.java
b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CXFWsdlOnlyTest.java
index 3be73e74875..41b556795f0 100644
---
a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CXFWsdlOnlyTest.java
+++
b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CXFWsdlOnlyTest.java
@@ -24,7 +24,6 @@ import jakarta.xml.ws.Holder;
import javax.xml.namespace.QName;
-import org.apache.camel.CamelContext;
import org.apache.camel.component.cxf.common.CXFTestSupport;
import org.apache.camel.test.spring.junit5.CamelSpringTestSupport;
import org.apache.camel.wsdl_first.Person;
@@ -38,7 +37,6 @@ import org.junit.jupiter.api.TestInstance;
import org.springframework.context.support.ClassPathXmlApplicationContext;
import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.junit.jupiter.api.Assertions.fail;
@@ -65,11 +63,6 @@ public class CXFWsdlOnlyTest extends CamelSpringTestSupport {
return new
ClassPathXmlApplicationContext("org/apache/camel/component/cxf/WsdlOnlyBeans.xml");
}
- @Override
- protected void assertValidContext(CamelContext context) {
- assertNotNull(context, "No context found!");
- }
-
@BeforeAll
public static void startServices() {
Object implementor = new PersonImpl();
diff --git
a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfNonWrapperTest.java
b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfNonWrapperTest.java
index f935ab12230..4cf6877abb4 100644
---
a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfNonWrapperTest.java
+++
b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfNonWrapperTest.java
@@ -22,7 +22,6 @@ import jakarta.xml.ws.BindingProvider;
import javax.xml.namespace.QName;
-import org.apache.camel.CamelContext;
import org.apache.camel.component.cxf.common.CXFTestSupport;
import org.apache.camel.non_wrapper.Person;
import org.apache.camel.non_wrapper.PersonService;
@@ -35,7 +34,6 @@ import org.junit.jupiter.api.TestInstance;
import org.springframework.context.support.ClassPathXmlApplicationContext;
import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.fail;
@TestInstance(TestInstance.Lifecycle.PER_CLASS)
@@ -47,11 +45,6 @@ public class CxfNonWrapperTest extends
CamelSpringTestSupport {
return new
ClassPathXmlApplicationContext("org/apache/camel/component/cxf/nonWrapperProcessor.xml");
}
- @Override
- protected void assertValidContext(CamelContext context) {
- assertNotNull(context, "No context found!");
- }
-
@Test
public void testInvokingServiceFromCXFClient() throws Exception {
diff --git
a/components/camel-infinispan/camel-infinispan-common/src/test/java/org/apache/camel/component/infinispan/InfinispanConsumerTestSupport.java
b/components/camel-infinispan/camel-infinispan-common/src/test/java/org/apache/camel/component/infinispan/InfinispanConsumerTestSupport.java
index 15017d5fa79..957d9685448 100644
---
a/components/camel-infinispan/camel-infinispan-common/src/test/java/org/apache/camel/component/infinispan/InfinispanConsumerTestSupport.java
+++
b/components/camel-infinispan/camel-infinispan-common/src/test/java/org/apache/camel/component/infinispan/InfinispanConsumerTestSupport.java
@@ -16,7 +16,6 @@
*/
package org.apache.camel.component.infinispan;
-import org.apache.camel.component.mock.MockEndpoint;
import org.infinispan.commons.api.BasicCache;
public interface InfinispanConsumerTestSupport {
@@ -27,6 +26,4 @@ public interface InfinispanConsumerTestSupport {
BasicCache<Object, Object> getCache();
BasicCache<Object, Object> getCache(String name);
-
- MockEndpoint getMockEndpoint(String id);
}
diff --git
a/components/camel-infinispan/camel-infinispan-common/src/test/java/org/apache/camel/component/infinispan/InfinispanIdempotentRepositoryTestSupport.java
b/components/camel-infinispan/camel-infinispan-common/src/test/java/org/apache/camel/component/infinispan/InfinispanIdempotentRepositoryTestSupport.java
index bb2ca7d0650..fe0945a4461 100644
---
a/components/camel-infinispan/camel-infinispan-common/src/test/java/org/apache/camel/component/infinispan/InfinispanIdempotentRepositoryTestSupport.java
+++
b/components/camel-infinispan/camel-infinispan-common/src/test/java/org/apache/camel/component/infinispan/InfinispanIdempotentRepositoryTestSupport.java
@@ -33,8 +33,6 @@ public interface InfinispanIdempotentRepositoryTestSupport {
BasicCache<Object, Object> getCache();
- MockEndpoint getMockEndpoint(String id);
-
ProducerTemplate template();
@Test
@@ -89,9 +87,7 @@ public interface InfinispanIdempotentRepositoryTestSupport {
assertFalse(getCache().containsKey("Two"));
}
- @Test
- default void producerQueryOperationWithoutQueryBuilder() throws Exception {
- MockEndpoint mock = getMockEndpoint("mock:result");
+ default void producerQueryOperationWithoutQueryBuilder(MockEndpoint mock)
throws Exception {
mock.expectedMessageCount(1);
final String messageId = UUID.randomUUID().toString();
diff --git
a/components/camel-infinispan/camel-infinispan-embedded/src/test/java/org/apache/camel/component/infinispan/embedded/InfinispanEmbeddedConsumerTest.java
b/components/camel-infinispan/camel-infinispan-embedded/src/test/java/org/apache/camel/component/infinispan/embedded/InfinispanEmbeddedConsumerTest.java
index ccc244a9c8a..6709462ad6f 100644
---
a/components/camel-infinispan/camel-infinispan-embedded/src/test/java/org/apache/camel/component/infinispan/embedded/InfinispanEmbeddedConsumerTest.java
+++
b/components/camel-infinispan/camel-infinispan-embedded/src/test/java/org/apache/camel/component/infinispan/embedded/InfinispanEmbeddedConsumerTest.java
@@ -163,11 +163,6 @@ public class InfinispanEmbeddedConsumerTest extends
InfinispanEmbeddedTestSuppor
return super.getCache(name);
}
- @Override
- public MockEndpoint getMockEndpoint(String id) {
- return super.getMockEndpoint(id);
- }
-
@Override
protected RouteBuilder createRouteBuilder() {
return new RouteBuilder() {
diff --git
a/components/camel-infinispan/camel-infinispan-embedded/src/test/java/org/apache/camel/component/infinispan/embedded/InfinispanEmbeddedCustomListenerTest.java
b/components/camel-infinispan/camel-infinispan-embedded/src/test/java/org/apache/camel/component/infinispan/embedded/InfinispanEmbeddedCustomListenerTest.java
index b9ef41247e5..efac291599f 100644
---
a/components/camel-infinispan/camel-infinispan-embedded/src/test/java/org/apache/camel/component/infinispan/embedded/InfinispanEmbeddedCustomListenerTest.java
+++
b/components/camel-infinispan/camel-infinispan-embedded/src/test/java/org/apache/camel/component/infinispan/embedded/InfinispanEmbeddedCustomListenerTest.java
@@ -66,11 +66,6 @@ public class InfinispanEmbeddedCustomListenerTest extends
InfinispanEmbeddedTest
return super.getCache(name);
}
- @Override
- public MockEndpoint getMockEndpoint(String id) {
- return super.getMockEndpoint(id);
- }
-
@Override
protected RouteBuilder createRouteBuilder() {
return new RouteBuilder() {
diff --git
a/components/camel-infinispan/camel-infinispan-embedded/src/test/java/org/apache/camel/component/infinispan/embedded/InfinispanEmbeddedIdempotentRepositoryTest.java
b/components/camel-infinispan/camel-infinispan-embedded/src/test/java/org/apache/camel/component/infinispan/embedded/InfinispanEmbeddedIdempotentRepositoryTest.java
index 8f6bb8e31ac..18c3338f941 100644
---
a/components/camel-infinispan/camel-infinispan-embedded/src/test/java/org/apache/camel/component/infinispan/embedded/InfinispanEmbeddedIdempotentRepositoryTest.java
+++
b/components/camel-infinispan/camel-infinispan-embedded/src/test/java/org/apache/camel/component/infinispan/embedded/InfinispanEmbeddedIdempotentRepositoryTest.java
@@ -25,6 +25,7 @@ import org.apache.camel.spi.IdempotentRepository;
import org.apache.camel.util.function.Suppliers;
import org.infinispan.commons.api.BasicCache;
import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
public class InfinispanEmbeddedIdempotentRepositoryTest extends
InfinispanEmbeddedTestSupport
implements InfinispanIdempotentRepositoryTestSupport {
@@ -42,6 +43,13 @@ public class InfinispanEmbeddedIdempotentRepositoryTest
extends InfinispanEmbedd
getCache().clear();
}
+ @Test
+ void producerQueryOperationWithoutQueryBuilder() throws Exception {
+ MockEndpoint mock = getMockEndpoint("mock:result");
+
+ producerQueryOperationWithoutQueryBuilder(mock);
+ }
+
@Override
public IdempotentRepository getIdempotentRepository() {
return repo.get();
@@ -52,11 +60,6 @@ public class InfinispanEmbeddedIdempotentRepositoryTest
extends InfinispanEmbedd
return super.getCache();
}
- @Override
- public MockEndpoint getMockEndpoint(String id) {
- return super.getMockEndpoint(id);
- }
-
@Override
public BasicCache<Object, Object> getCache(String name) {
return super.getCache(name);
diff --git
a/components/camel-infinispan/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/remote/InfinispanRemoteConsumerIT.java
b/components/camel-infinispan/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/remote/InfinispanRemoteConsumerIT.java
index f8a2e641810..51fed12d7d1 100644
---
a/components/camel-infinispan/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/remote/InfinispanRemoteConsumerIT.java
+++
b/components/camel-infinispan/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/remote/InfinispanRemoteConsumerIT.java
@@ -57,11 +57,6 @@ public class InfinispanRemoteConsumerIT extends
InfinispanRemoteTestSupport impl
return super.getCache(name);
}
- @Override
- public MockEndpoint getMockEndpoint(String id) {
- return super.getMockEndpoint(id);
- }
-
@Override
protected RouteBuilder createRouteBuilder() {
return new RouteBuilder() {
diff --git
a/components/camel-infinispan/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/remote/InfinispanRemoteCustomListenerIT.java
b/components/camel-infinispan/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/remote/InfinispanRemoteCustomListenerIT.java
index 8d41a85bc83..abdf0b2b5bb 100644
---
a/components/camel-infinispan/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/remote/InfinispanRemoteCustomListenerIT.java
+++
b/components/camel-infinispan/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/remote/InfinispanRemoteCustomListenerIT.java
@@ -61,11 +61,6 @@ public class InfinispanRemoteCustomListenerIT extends
InfinispanRemoteTestSuppor
return super.getCache(name);
}
- @Override
- public MockEndpoint getMockEndpoint(String id) {
- return super.getMockEndpoint(id);
- }
-
@Override
protected RouteBuilder createRouteBuilder() {
return new RouteBuilder() {
diff --git
a/components/camel-infinispan/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/remote/InfinispanRemoteIdempotentRepositoryIT.java
b/components/camel-infinispan/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/remote/InfinispanRemoteIdempotentRepositoryIT.java
index 4c7d93f9c17..d8158ba0fbd 100644
---
a/components/camel-infinispan/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/remote/InfinispanRemoteIdempotentRepositoryIT.java
+++
b/components/camel-infinispan/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/remote/InfinispanRemoteIdempotentRepositoryIT.java
@@ -25,6 +25,7 @@ import org.apache.camel.spi.IdempotentRepository;
import org.apache.camel.util.function.Suppliers;
import org.infinispan.commons.api.BasicCache;
import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
public class InfinispanRemoteIdempotentRepositoryIT extends
InfinispanRemoteTestSupport
implements InfinispanIdempotentRepositoryTestSupport {
@@ -52,16 +53,18 @@ public class InfinispanRemoteIdempotentRepositoryIT extends
InfinispanRemoteTest
return super.getCache();
}
- @Override
- public MockEndpoint getMockEndpoint(String id) {
- return super.getMockEndpoint(id);
- }
-
@Override
public BasicCache<Object, Object> getCache(String name) {
return super.getCache(name);
}
+ @Test
+ void producerQueryOperationWithoutQueryBuilder() throws Exception {
+ MockEndpoint mock = getMockEndpoint("mock:result");
+
+ producerQueryOperationWithoutQueryBuilder(mock);
+ }
+
@Override
protected RouteBuilder createRouteBuilder() {
return new RouteBuilder() {
diff --git
a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailComponentTest.java
b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailComponentTest.java
index a3bdc5e7d18..7c583d30929 100644
---
a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailComponentTest.java
+++
b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailComponentTest.java
@@ -34,7 +34,7 @@ public class MailComponentTest extends CamelTestSupport {
@Test
public void testMailEndpointsAreConfiguredProperlyWhenUsingSmtp() {
- MailEndpoint endpoint =
resolveMandatoryEndpoint("smtp://james@myhost:25/subject");
+ MailEndpoint endpoint =
checkEndpoint("smtp://james@myhost:25/subject");
MailConfiguration config = endpoint.getConfiguration();
assertEquals("smtp", config.getProtocol(), "getProtocol()");
assertEquals("myhost", config.getHost(), "getHost()");
@@ -48,7 +48,7 @@ public class MailComponentTest extends CamelTestSupport {
@Test
public void testMailEndpointsAreConfiguredProperlyWhenUsingImap() {
- MailEndpoint endpoint =
resolveMandatoryEndpoint("imap://james@myhost:143/subject");
+ MailEndpoint endpoint =
checkEndpoint("imap://james@myhost:143/subject");
MailConfiguration config = endpoint.getConfiguration();
assertEquals("imap", config.getProtocol(), "getProtocol()");
assertEquals("myhost", config.getHost(), "getHost()");
@@ -62,7 +62,7 @@ public class MailComponentTest extends CamelTestSupport {
@Test
public void testMailEndpointsAreConfiguredProperlyWhenUsingPop() {
- MailEndpoint endpoint =
resolveMandatoryEndpoint("pop3://james@myhost:110/subject");
+ MailEndpoint endpoint =
checkEndpoint("pop3://james@myhost:110/subject");
MailConfiguration config = endpoint.getConfiguration();
assertEquals("pop3", config.getProtocol(), "getProtocol()");
assertEquals("myhost", config.getHost(), "getHost()");
@@ -76,7 +76,7 @@ public class MailComponentTest extends CamelTestSupport {
@Test
public void testDefaultSMTPConfiguration() {
- MailEndpoint endpoint =
resolveMandatoryEndpoint("smtp://james@myhost?password=secret");
+ MailEndpoint endpoint =
checkEndpoint("smtp://james@myhost?password=secret");
MailConfiguration config = endpoint.getConfiguration();
assertEquals("smtp", config.getProtocol(), "getProtocol()");
assertEquals("myhost", config.getHost(), "getHost()");
@@ -100,7 +100,7 @@ public class MailComponentTest extends CamelTestSupport {
@Test
public void testDefaultSMTPSConfiguration() {
- MailEndpoint endpoint =
resolveMandatoryEndpoint("smtps://james@myhost?password=secret");
+ MailEndpoint endpoint =
checkEndpoint("smtps://james@myhost?password=secret");
MailConfiguration config = endpoint.getConfiguration();
assertEquals("smtps", config.getProtocol(), "getProtocol()");
assertEquals("myhost", config.getHost(), "getHost()");
@@ -124,21 +124,21 @@ public class MailComponentTest extends CamelTestSupport {
@Test
public void testDebugMode() {
- MailEndpoint endpoint =
resolveMandatoryEndpoint("smtp://james@myhost?password=secret&debugMode=true");
+ MailEndpoint endpoint =
checkEndpoint("smtp://james@myhost?password=secret&debugMode=true");
MailConfiguration config = endpoint.getConfiguration();
assertEquals(true, config.isDebugMode());
}
@Test
public void testConnectionTimeout() {
- MailEndpoint endpoint =
resolveMandatoryEndpoint("smtp://james@myhost?password=secret&connectionTimeout=2500");
+ MailEndpoint endpoint =
checkEndpoint("smtp://james@myhost?password=secret&connectionTimeout=2500");
MailConfiguration config = endpoint.getConfiguration();
assertEquals(2500, config.getConnectionTimeout());
}
@Test
public void testDefaultPOP3Configuration() {
- MailEndpoint endpoint =
resolveMandatoryEndpoint("pop3://james@myhost?password=secret");
+ MailEndpoint endpoint =
checkEndpoint("pop3://james@myhost?password=secret");
MailConfiguration config = endpoint.getConfiguration();
assertEquals("pop3", config.getProtocol(), "getProtocol()");
assertEquals("myhost", config.getHost(), "getHost()");
@@ -159,7 +159,7 @@ public class MailComponentTest extends CamelTestSupport {
@Test
public void testDefaultIMAPConfiguration() {
- MailEndpoint endpoint =
resolveMandatoryEndpoint("imap://james@myhost?password=secret");
+ MailEndpoint endpoint =
checkEndpoint("imap://james@myhost?password=secret");
MailConfiguration config = endpoint.getConfiguration();
assertEquals("imap", config.getProtocol(), "getProtocol()");
assertEquals("myhost", config.getHost(), "getHost()");
@@ -180,9 +180,9 @@ public class MailComponentTest extends CamelTestSupport {
@Test
public void testManyConfigurations() {
- MailEndpoint endpoint =
resolveMandatoryEndpoint("smtp://james@myhost:30/subject?password=secret"
- +
"&from=m...@camelriders.org&delete=true&folderName=riders"
- +
"&contentType=text/html&unseen=false");
+ MailEndpoint endpoint =
checkEndpoint("smtp://james@myhost:30/subject?password=secret"
+ +
"&from=m...@camelriders.org&delete=true&folderName=riders"
+ +
"&contentType=text/html&unseen=false");
MailConfiguration config = endpoint.getConfiguration();
assertEquals("smtp", config.getProtocol(), "getProtocol()");
assertEquals("myhost", config.getHost(), "getHost()");
@@ -204,7 +204,7 @@ public class MailComponentTest extends CamelTestSupport {
@Test
public void testTo() {
MailEndpoint endpoint
- =
resolveMandatoryEndpoint("smtp://james@myhost:25/?password=secret&to=some...@outthere.com&folderName=XXX");
+ =
checkEndpoint("smtp://james@myhost:25/?password=secret&to=some...@outthere.com&folderName=XXX");
MailConfiguration config = endpoint.getConfiguration();
assertEquals("smtp", config.getProtocol(), "getProtocol()");
assertEquals("myhost", config.getHost(), "getHost()");
@@ -223,7 +223,7 @@ public class MailComponentTest extends CamelTestSupport {
@Test
public void testNoUserInfoButUsername() {
- MailEndpoint endpoint =
resolveMandatoryEndpoint("smtp://myhost:25/?password=secret&username=james");
+ MailEndpoint endpoint =
checkEndpoint("smtp://myhost:25/?password=secret&username=james");
MailConfiguration config = endpoint.getConfiguration();
assertEquals("smtp", config.getProtocol(), "getProtocol()");
assertEquals("myhost", config.getHost(), "getHost()");
@@ -244,7 +244,7 @@ public class MailComponentTest extends CamelTestSupport {
public void testAuthenticator() {
DefaultAuthenticator auth1 = new DefaultAuthenticator("u1", "p1");
context.getRegistry().bind("auth1", auth1);
- MailEndpoint endpoint =
resolveMandatoryEndpoint("smtp://myhost:25/?authenticator=#auth1&to=james%40myhost");
+ MailEndpoint endpoint =
checkEndpoint("smtp://myhost:25/?authenticator=#auth1&to=james%40myhost");
MailConfiguration config = endpoint.getConfiguration();
assertEquals("smtp", config.getProtocol(), "getProtocol()");
assertEquals("myhost", config.getHost(), "getHost()");
@@ -266,7 +266,7 @@ public class MailComponentTest extends CamelTestSupport {
@Test
public void testMailEndpointsWithFetchSize() {
- MailEndpoint endpoint =
resolveMandatoryEndpoint("pop3://james@myhost?fetchSize=5");
+ MailEndpoint endpoint =
checkEndpoint("pop3://james@myhost?fetchSize=5");
MailConfiguration config = endpoint.getConfiguration();
assertEquals("pop3", config.getProtocol(), "getProtocol()");
assertEquals("myhost", config.getHost(), "getHost()");
@@ -281,7 +281,7 @@ public class MailComponentTest extends CamelTestSupport {
@Test
public void testSMTPEndpointWithSubjectOption() {
- MailEndpoint endpoint =
resolveMandatoryEndpoint("smtp://myhost:25?subject=hello");
+ MailEndpoint endpoint =
checkEndpoint("smtp://myhost:25?subject=hello");
MailConfiguration config = endpoint.getConfiguration();
assertEquals("smtp", config.getProtocol(), "getProtocol()");
assertEquals("myhost", config.getHost(), "getHost()");
@@ -290,8 +290,7 @@ public class MailComponentTest extends CamelTestSupport {
assertFalse(config.isDebugMode());
}
- @Override
- protected MailEndpoint resolveMandatoryEndpoint(String uri) {
+ protected MailEndpoint checkEndpoint(String uri) {
Endpoint endpoint = super.resolveMandatoryEndpoint(uri);
return assertIsInstanceOf(MailEndpoint.class, endpoint);
}
diff --git
a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailMessageTest.java
b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailMessageTest.java
index 82f63e61ccb..99d34cab8a1 100644
---
a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailMessageTest.java
+++
b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailMessageTest.java
@@ -88,7 +88,7 @@ public class MailMessageTest extends CamelTestSupport {
super.setUp();
Mailbox.clearAll();
- endpoint =
resolveMandatoryEndpoint("pop3://someone@myhost:30/subject");
+ endpoint = checkEndpoint("pop3://someone@myhost:30/subject");
Properties properties = new Properties();
properties.put("mail.smtp.host", "localhost");
@@ -98,8 +98,7 @@ public class MailMessageTest extends CamelTestSupport {
mimeMessage.setText(body);
}
- @Override
- protected MailEndpoint resolveMandatoryEndpoint(String uri) {
+ protected MailEndpoint checkEndpoint(String uri) {
Endpoint endpoint = super.resolveMandatoryEndpoint(uri);
return assertIsInstanceOf(MailEndpoint.class, endpoint);
}
diff --git
a/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzEndpointConfigureTest.java
b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzEndpointConfigureTest.java
index e368b87c492..0fcb3f8af96 100644
---
a/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzEndpointConfigureTest.java
+++
b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzEndpointConfigureTest.java
@@ -36,7 +36,7 @@ public class QuartzEndpointConfigureTest extends
BaseQuartzTest {
@Test
public void testConfigureGroupAndName() throws Exception {
QuartzEndpoint endpoint
- =
resolveMandatoryEndpoint("quartz://myGroup/myName?trigger.repeatCount=3&trigger.repeatInterval=100");
+ =
checkEndpoint("quartz://myGroup/myName?trigger.repeatCount=3&trigger.repeatInterval=100");
Scheduler scheduler = endpoint.getComponent().getScheduler();
TriggerKey triggerKey = endpoint.getTriggerKey();
@@ -54,7 +54,7 @@ public class QuartzEndpointConfigureTest extends
BaseQuartzTest {
@Test
public void testConfigureName() throws Exception {
- QuartzEndpoint endpoint = resolveMandatoryEndpoint("quartz://myName");
+ QuartzEndpoint endpoint = checkEndpoint("quartz://myName");
Scheduler scheduler = endpoint.getComponent().getScheduler();
TriggerKey triggerKey = endpoint.getTriggerKey();
@@ -68,7 +68,7 @@ public class QuartzEndpointConfigureTest extends
BaseQuartzTest {
@Test
public void testConfigureCronExpression() throws Exception {
- QuartzEndpoint endpoint =
resolveMandatoryEndpoint("quartz://myGroup/myTimerName?cron=0+0/5+12-18+?+*+MON-FRI");
+ QuartzEndpoint endpoint =
checkEndpoint("quartz://myGroup/myTimerName?cron=0+0/5+12-18+?+*+MON-FRI");
Scheduler scheduler = endpoint.getComponent().getScheduler();
TriggerKey triggerKey = endpoint.getTriggerKey();
@@ -87,7 +87,7 @@ public class QuartzEndpointConfigureTest extends
BaseQuartzTest {
@Test
public void testConfigureAnotherCronExpression() throws Exception {
- QuartzEndpoint endpoint =
resolveMandatoryEndpoint("quartz://myGroup/myTimerName?cron=0+0+*+*+*+?");
+ QuartzEndpoint endpoint =
checkEndpoint("quartz://myGroup/myTimerName?cron=0+0+*+*+*+?");
Scheduler scheduler = endpoint.getComponent().getScheduler();
TriggerKey triggerKey = endpoint.getTriggerKey();
@@ -106,7 +106,7 @@ public class QuartzEndpointConfigureTest extends
BaseQuartzTest {
@Test
public void testConfigureJobName() throws Exception {
- QuartzEndpoint endpoint =
resolveMandatoryEndpoint("quartz://myGroup/myTimerName?job.name=hadrian&cron=0+0+*+*+*+?");
+ QuartzEndpoint endpoint =
checkEndpoint("quartz://myGroup/myTimerName?job.name=hadrian&cron=0+0+*+*+*+?");
Scheduler scheduler = endpoint.getComponent().getScheduler();
TriggerKey triggerKey = endpoint.getTriggerKey();
@@ -123,7 +123,7 @@ public class QuartzEndpointConfigureTest extends
BaseQuartzTest {
@Test
public void testConfigureNoDoubleSlashNoCron() {
- QuartzEndpoint endpoint =
resolveMandatoryEndpoint("quartz:myGroup/myTimerName");
+ QuartzEndpoint endpoint = checkEndpoint("quartz:myGroup/myTimerName");
TriggerKey triggerKey = endpoint.getTriggerKey();
assertEquals("myTimerName", triggerKey.getName(), "getName()");
@@ -132,7 +132,7 @@ public class QuartzEndpointConfigureTest extends
BaseQuartzTest {
@Test
public void testConfigureNoDoubleSlashQuestionCron() throws Exception {
- QuartzEndpoint endpoint =
resolveMandatoryEndpoint("quartz:myGroup/myTimerName?cron=0+0+*+*+*+?");
+ QuartzEndpoint endpoint =
checkEndpoint("quartz:myGroup/myTimerName?cron=0+0+*+*+*+?");
Scheduler scheduler = endpoint.getComponent().getScheduler();
TriggerKey triggerKey = endpoint.getTriggerKey();
@@ -151,17 +151,16 @@ public class QuartzEndpointConfigureTest extends
BaseQuartzTest {
@Test
public void testConfigureDeleteJob() {
- QuartzEndpoint endpoint =
resolveMandatoryEndpoint("quartz:myGroup/myTimerName?cron=0+0+*+*+*+?");
+ QuartzEndpoint endpoint =
checkEndpoint("quartz:myGroup/myTimerName?cron=0+0+*+*+*+?");
assertEquals("0 0 * * * ?", endpoint.getCron(), "cron expression");
assertTrue(endpoint.isDeleteJob(), "deleteJob");
- endpoint =
resolveMandatoryEndpoint("quartz:myGroup/myTimerName2?cron=1+0+*+*+*+?&deleteJob=false");
+ endpoint =
checkEndpoint("quartz:myGroup/myTimerName2?cron=1+0+*+*+*+?&deleteJob=false");
assertEquals("1 0 * * * ?", endpoint.getCron(), "cron expression");
assertFalse(endpoint.isDeleteJob(), "deleteJob");
}
- @Override
- protected QuartzEndpoint resolveMandatoryEndpoint(String uri) {
+ protected QuartzEndpoint checkEndpoint(String uri) {
Endpoint endpoint = super.resolveMandatoryEndpoint(uri);
return assertIsInstanceOf(QuartzEndpoint.class, endpoint);
}
diff --git
a/components/camel-test/camel-test-junit5/src/main/java/org/apache/camel/test/junit5/CamelTestSupport.java
b/components/camel-test/camel-test-junit5/src/main/java/org/apache/camel/test/junit5/CamelTestSupport.java
index 13df4735cf3..a16ba69afd0 100644
---
a/components/camel-test/camel-test-junit5/src/main/java/org/apache/camel/test/junit5/CamelTestSupport.java
+++
b/components/camel-test/camel-test-junit5/src/main/java/org/apache/camel/test/junit5/CamelTestSupport.java
@@ -787,7 +787,7 @@ public abstract class CamelTestSupport
* @param uri the Camel <a href="">URI</a> to use to create or resolve an
endpoint
* @return the endpoint
*/
- protected Endpoint resolveMandatoryEndpoint(String uri) {
+ protected final Endpoint resolveMandatoryEndpoint(String uri) {
return TestSupport.resolveMandatoryEndpoint(context, uri);
}
@@ -797,7 +797,7 @@ public abstract class CamelTestSupport
* @param uri the Camel <a href="">URI</a> to use to create or resolve an
endpoint
* @return the endpoint
*/
- protected <T extends Endpoint> T resolveMandatoryEndpoint(String uri,
Class<T> endpointType) {
+ protected final <T extends Endpoint> T resolveMandatoryEndpoint(String
uri, Class<T> endpointType) {
return TestSupport.resolveMandatoryEndpoint(context, uri,
endpointType);
}
@@ -807,7 +807,7 @@ public abstract class CamelTestSupport
* @param uri the URI which typically starts with "mock:" and has some
name
* @return the mandatory mock endpoint or an exception is thrown if it
could not be resolved
*/
- protected MockEndpoint getMockEndpoint(String uri) {
+ protected final MockEndpoint getMockEndpoint(String uri) {
return getMockEndpoint(uri, true);
}
@@ -822,7 +822,7 @@ public abstract class CamelTestSupport
* be resolved
* @throws NoSuchEndpointException is the mock endpoint does not exist
*/
- protected MockEndpoint getMockEndpoint(String uri, boolean create) throws
NoSuchEndpointException {
+ protected final MockEndpoint getMockEndpoint(String uri, boolean create)
throws NoSuchEndpointException {
// look for existing mock endpoints that have the same queue name, and
// to
// do that we need to normalize uri and strip out query parameters and
@@ -841,7 +841,7 @@ public abstract class CamelTestSupport
* @param endpointUri the URI of the endpoint to send to
* @param body the body for the message
*/
- protected void sendBody(String endpointUri, final Object body) {
+ protected final void sendBody(String endpointUri, final Object body) {
template.send(endpointUri, exchange -> {
Message in = exchange.getIn();
in.setBody(body);
@@ -855,7 +855,7 @@ public abstract class CamelTestSupport
* @param body the body for the message
* @param headers any headers to set on the message
*/
- protected void sendBody(String endpointUri, final Object body, final
Map<String, Object> headers) {
+ protected final void sendBody(String endpointUri, final Object body, final
Map<String, Object> headers) {
template.send(endpointUri, exchange -> {
Message in = exchange.getIn();
in.setBody(body);
@@ -872,7 +872,7 @@ public abstract class CamelTestSupport
* @param bodies the bodies to send, one per message
*/
@Deprecated
- protected void sendBodies(String endpointUri, Object... bodies) {
+ protected final void sendBodies(String endpointUri, Object... bodies) {
for (Object body : bodies) {
sendBody(endpointUri, body);
}
@@ -881,14 +881,14 @@ public abstract class CamelTestSupport
/**
* Creates an exchange with the given body
*/
- protected Exchange createExchangeWithBody(Object body) {
+ protected final Exchange createExchangeWithBody(Object body) {
return TestSupport.createExchangeWithBody(context, body);
}
/**
* Asserts that the given language name and expression evaluates to the
given value on a specific exchange
*/
- protected void assertExpression(Exchange exchange, String languageName,
String expressionText, Object expectedValue) {
+ protected final void assertExpression(Exchange exchange, String
languageName, String expressionText, Object expectedValue) {
Language language = assertResolveLanguage(languageName);
Expression expression = language.createExpression(expressionText);
@@ -901,7 +901,7 @@ public abstract class CamelTestSupport
* Asserts that the given language name and predicate expression evaluates
to the expected value on the message
* exchange
*/
- protected void assertPredicate(String languageName, String expressionText,
Exchange exchange, boolean expected) {
+ protected final void assertPredicate(String languageName, String
expressionText, Exchange exchange, boolean expected) {
Language language = assertResolveLanguage(languageName);
Predicate predicate = language.createPredicate(expressionText);
@@ -913,23 +913,23 @@ public abstract class CamelTestSupport
/**
* Asserts that the language name can be resolved
*/
- protected Language assertResolveLanguage(String languageName) {
+ protected final Language assertResolveLanguage(String languageName) {
Language language = context.resolveLanguage(languageName);
assertNotNull(language, "Nog language found for name: " +
languageName);
return language;
}
- protected void assertValidContext(CamelContext context) {
+ protected final void assertValidContext(CamelContext context) {
assertNotNull(context, "No context found!");
}
- protected <T extends Endpoint> T getMandatoryEndpoint(String uri, Class<T>
type) {
+ protected final <T extends Endpoint> T getMandatoryEndpoint(String uri,
Class<T> type) {
T endpoint = context.getEndpoint(uri, type);
assertNotNull(endpoint, "No endpoint found for uri: " + uri);
return endpoint;
}
- protected Endpoint getMandatoryEndpoint(String uri) {
+ protected final Endpoint getMandatoryEndpoint(String uri) {
Endpoint endpoint = context.getEndpoint(uri);
assertNotNull(endpoint, "No endpoint found for uri: " + uri);
return endpoint;
