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 c38a276cc45c9abc5a0100eaf064373f56bc51ca
Author: Otavio Rodolfo Piske <angusyo...@gmail.com>
AuthorDate: Tue Jan 31 10:44:20 2023 +0100
(chores) camel-core: tests cleanups
- use static class when possible
---
.../java/org/apache/camel/cluster/ClusterServiceSelectorTest.java | 4 ++--
.../camel/component/bean/BeanInfoAMoreComplexOverloadedTest.java | 4 ++--
.../java/org/apache/camel/component/bean/BeanInfoOverloadedTest.java | 2 +-
.../camel/component/bean/BeanInfoOverloadedWithSubTypeParamTest.java | 2 +-
.../src/test/java/org/apache/camel/component/bean/BeanInfoTest.java | 2 +-
.../test/java/org/apache/camel/impl/CustomUnitOfWorkFactoryTest.java | 2 +-
.../apache/camel/impl/DefaultComponentReferencePropertiesTest.java | 2 +-
.../src/test/java/org/apache/camel/impl/DefaultProducerCacheTest.java | 2 +-
.../apache/camel/impl/EventDrivenPollingConsumerQueueSizeTest.java | 2 +-
.../java/org/apache/camel/impl/ProducerCacheNonSingletonTest.java | 2 +-
.../camel/impl/engine/DefaultSupervisingRouteControllerTest.java | 2 +-
.../src/test/java/org/apache/camel/issues/Camel4857UriIssueTest.java | 2 +-
.../java/org/apache/camel/issues/EndpointWithRawUriParameterTest.java | 2 +-
.../issues/RedeliveryPolicyOnExceptionWhileRedeliveringIssueTest.java | 2 +-
.../apache/camel/issues/RouteStartupFailShouldStopAlsoIssueTest.java | 2 +-
.../java/org/apache/camel/processor/ConsumerRouteIdAwareTest.java | 2 +-
.../java/org/apache/camel/processor/PipelineStepWithEventTest.java | 4 ++--
.../test/java/org/apache/camel/support/IntrospectionSupportTest.java | 2 +-
18 files changed, 21 insertions(+), 21 deletions(-)
diff --git
a/core/camel-core/src/test/java/org/apache/camel/cluster/ClusterServiceSelectorTest.java
b/core/camel-core/src/test/java/org/apache/camel/cluster/ClusterServiceSelectorTest.java
index 8fc8355907a..f8abc4a2925 100644
---
a/core/camel-core/src/test/java/org/apache/camel/cluster/ClusterServiceSelectorTest.java
+++
b/core/camel-core/src/test/java/org/apache/camel/cluster/ClusterServiceSelectorTest.java
@@ -326,7 +326,7 @@ public class ClusterServiceSelectorTest {
// Helpers
// **************************************
- private final class DummyClusterService1 extends
AbstractCamelClusterService {
+ private static final class DummyClusterService1 extends
AbstractCamelClusterService {
public DummyClusterService1() {
}
@@ -336,7 +336,7 @@ public class ClusterServiceSelectorTest {
}
}
- private final class DummyClusterService2 extends
AbstractCamelClusterService {
+ private static final class DummyClusterService2 extends
AbstractCamelClusterService {
public DummyClusterService2() {
}
diff --git
a/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanInfoAMoreComplexOverloadedTest.java
b/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanInfoAMoreComplexOverloadedTest.java
index 8dad77cc9c7..703e15cb169 100644
---
a/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanInfoAMoreComplexOverloadedTest.java
+++
b/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanInfoAMoreComplexOverloadedTest.java
@@ -93,11 +93,11 @@ public class BeanInfoAMoreComplexOverloadedTest extends
ContextTestSupport {
public long id;
}
- class RequestA extends BaseRequest {
+ static class RequestA extends BaseRequest {
public int i;
}
- class RequestB extends BaseRequest {
+ static class RequestB extends BaseRequest {
public String s;
}
diff --git
a/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanInfoOverloadedTest.java
b/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanInfoOverloadedTest.java
index cfe9acfe16c..ccc1e2c77ed 100644
---
a/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanInfoOverloadedTest.java
+++
b/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanInfoOverloadedTest.java
@@ -46,7 +46,7 @@ public class BeanInfoOverloadedTest extends
ContextTestSupport {
assertEquals(RequestB.class, method.getGenericParameterTypes()[0]);
}
- class Bean {
+ static class Bean {
public void doSomething(RequestA request) {
}
diff --git
a/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanInfoOverloadedWithSubTypeParamTest.java
b/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanInfoOverloadedWithSubTypeParamTest.java
index a62ec949f38..28d5a2e3fbb 100644
---
a/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanInfoOverloadedWithSubTypeParamTest.java
+++
b/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanInfoOverloadedWithSubTypeParamTest.java
@@ -41,6 +41,6 @@ public class BeanInfoOverloadedWithSubTypeParamTest extends
ContextTestSupport {
static class RequestB {
}
- class RequestC extends RequestB {
+ static class RequestC extends RequestB {
}
}
diff --git
a/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanInfoTest.java
b/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanInfoTest.java
index fd2dbecdacd..0e9b1134ecf 100644
---
a/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanInfoTest.java
+++
b/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanInfoTest.java
@@ -225,7 +225,7 @@ public class BeanInfoTest {
}
}
- public class PublicClassImplementingBySuperPackagePrivateClass extends
PackagePrivateClassDefiningMethod
+ public static class PublicClassImplementingBySuperPackagePrivateClass
extends PackagePrivateClassDefiningMethod
implements IMethodInterface {
}
diff --git
a/core/camel-core/src/test/java/org/apache/camel/impl/CustomUnitOfWorkFactoryTest.java
b/core/camel-core/src/test/java/org/apache/camel/impl/CustomUnitOfWorkFactoryTest.java
index b647ed28a71..05171a082ac 100644
---
a/core/camel-core/src/test/java/org/apache/camel/impl/CustomUnitOfWorkFactoryTest.java
+++
b/core/camel-core/src/test/java/org/apache/camel/impl/CustomUnitOfWorkFactoryTest.java
@@ -57,7 +57,7 @@ public class CustomUnitOfWorkFactoryTest extends
ContextTestSupport {
};
}
- private class MyUnitOfWorkFactory implements UnitOfWorkFactory {
+ private static class MyUnitOfWorkFactory implements UnitOfWorkFactory {
@Override
public UnitOfWork createUnitOfWork(Exchange exchange) {
diff --git
a/core/camel-core/src/test/java/org/apache/camel/impl/DefaultComponentReferencePropertiesTest.java
b/core/camel-core/src/test/java/org/apache/camel/impl/DefaultComponentReferencePropertiesTest.java
index a151151b123..7c39afab159 100644
---
a/core/camel-core/src/test/java/org/apache/camel/impl/DefaultComponentReferencePropertiesTest.java
+++
b/core/camel-core/src/test/java/org/apache/camel/impl/DefaultComponentReferencePropertiesTest.java
@@ -90,7 +90,7 @@ public class DefaultComponentReferencePropertiesTest extends
ContextTestSupport
}
}
- public final class MyComponent extends DefaultComponent {
+ public static final class MyComponent extends DefaultComponent {
private MyComponent(CamelContext context) {
super(context);
diff --git
a/core/camel-core/src/test/java/org/apache/camel/impl/DefaultProducerCacheTest.java
b/core/camel-core/src/test/java/org/apache/camel/impl/DefaultProducerCacheTest.java
index fb7466cb78b..f901642cc8f 100644
---
a/core/camel-core/src/test/java/org/apache/camel/impl/DefaultProducerCacheTest.java
+++
b/core/camel-core/src/test/java/org/apache/camel/impl/DefaultProducerCacheTest.java
@@ -208,7 +208,7 @@ public class DefaultProducerCacheTest extends
ContextTestSupport {
await().atMost(3, TimeUnit.SECONDS).untilAsserted(() ->
assertEquals(3, stopCounter.get()));
}
- private class MyProducerCache extends DefaultProducerCache {
+ private static class MyProducerCache extends DefaultProducerCache {
private MyServicePool myServicePool;
diff --git
a/core/camel-core/src/test/java/org/apache/camel/impl/EventDrivenPollingConsumerQueueSizeTest.java
b/core/camel-core/src/test/java/org/apache/camel/impl/EventDrivenPollingConsumerQueueSizeTest.java
index c0ada2c1295..b3badbe81e5 100644
---
a/core/camel-core/src/test/java/org/apache/camel/impl/EventDrivenPollingConsumerQueueSizeTest.java
+++
b/core/camel-core/src/test/java/org/apache/camel/impl/EventDrivenPollingConsumerQueueSizeTest.java
@@ -105,7 +105,7 @@ public class EventDrivenPollingConsumerQueueSizeTest
extends ContextTestSupport
return false;
}
- private final class MyQueueComponent extends DefaultComponent {
+ private static final class MyQueueComponent extends DefaultComponent {
@Override
protected Endpoint createEndpoint(String uri, String remaining,
Map<String, Object> parameters) throws Exception {
diff --git
a/core/camel-core/src/test/java/org/apache/camel/impl/ProducerCacheNonSingletonTest.java
b/core/camel-core/src/test/java/org/apache/camel/impl/ProducerCacheNonSingletonTest.java
index a9b91b5d859..1991b3d4a06 100644
---
a/core/camel-core/src/test/java/org/apache/camel/impl/ProducerCacheNonSingletonTest.java
+++
b/core/camel-core/src/test/java/org/apache/camel/impl/ProducerCacheNonSingletonTest.java
@@ -71,7 +71,7 @@ public class ProducerCacheNonSingletonTest extends
ContextTestSupport {
}
}
- public class MyDummyEndpoint extends DefaultEndpoint {
+ public static class MyDummyEndpoint extends DefaultEndpoint {
@Override
public Producer createProducer() throws Exception {
diff --git
a/core/camel-core/src/test/java/org/apache/camel/impl/engine/DefaultSupervisingRouteControllerTest.java
b/core/camel-core/src/test/java/org/apache/camel/impl/engine/DefaultSupervisingRouteControllerTest.java
index 05bce5e38af..e56e29851f6 100644
---
a/core/camel-core/src/test/java/org/apache/camel/impl/engine/DefaultSupervisingRouteControllerTest.java
+++
b/core/camel-core/src/test/java/org/apache/camel/impl/engine/DefaultSupervisingRouteControllerTest.java
@@ -143,7 +143,7 @@ public class DefaultSupervisingRouteControllerTest extends
ContextTestSupport {
}
}
- private class MyJmsEndpoint extends SedaEndpoint {
+ private static class MyJmsEndpoint extends SedaEndpoint {
private String name;
diff --git
a/core/camel-core/src/test/java/org/apache/camel/issues/Camel4857UriIssueTest.java
b/core/camel-core/src/test/java/org/apache/camel/issues/Camel4857UriIssueTest.java
index 0c950ce32c7..8a939157ca1 100644
---
a/core/camel-core/src/test/java/org/apache/camel/issues/Camel4857UriIssueTest.java
+++
b/core/camel-core/src/test/java/org/apache/camel/issues/Camel4857UriIssueTest.java
@@ -70,7 +70,7 @@ public class Camel4857UriIssueTest extends ContextTestSupport
{
}
}
- class MyComponent extends DefaultComponent {
+ static class MyComponent extends DefaultComponent {
@Override
protected Endpoint createEndpoint(final String uri, final String
remaining, final Map<String, Object> parameters)
diff --git
a/core/camel-core/src/test/java/org/apache/camel/issues/EndpointWithRawUriParameterTest.java
b/core/camel-core/src/test/java/org/apache/camel/issues/EndpointWithRawUriParameterTest.java
index b49f622791b..e6e5b26fe1f 100644
---
a/core/camel-core/src/test/java/org/apache/camel/issues/EndpointWithRawUriParameterTest.java
+++
b/core/camel-core/src/test/java/org/apache/camel/issues/EndpointWithRawUriParameterTest.java
@@ -36,7 +36,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
public class EndpointWithRawUriParameterTest extends ContextTestSupport {
- public final class MyComponent extends DefaultComponent {
+ public static final class MyComponent extends DefaultComponent {
@Override
protected Endpoint createEndpoint(String uri, String remaining,
Map<String, Object> parameters) throws Exception {
diff --git
a/core/camel-core/src/test/java/org/apache/camel/issues/RedeliveryPolicyOnExceptionWhileRedeliveringIssueTest.java
b/core/camel-core/src/test/java/org/apache/camel/issues/RedeliveryPolicyOnExceptionWhileRedeliveringIssueTest.java
index 49b424dccd3..263a361a360 100644
---
a/core/camel-core/src/test/java/org/apache/camel/issues/RedeliveryPolicyOnExceptionWhileRedeliveringIssueTest.java
+++
b/core/camel-core/src/test/java/org/apache/camel/issues/RedeliveryPolicyOnExceptionWhileRedeliveringIssueTest.java
@@ -37,7 +37,7 @@ public class
RedeliveryPolicyOnExceptionWhileRedeliveringIssueTest extends Conte
private static final long serialVersionUID = 1L;
}
- private class ExceptionThrowingProcessor implements Processor {
+ private static class ExceptionThrowingProcessor implements Processor {
@Override
public void process(Exchange exchange) throws Exception {
diff --git
a/core/camel-core/src/test/java/org/apache/camel/issues/RouteStartupFailShouldStopAlsoIssueTest.java
b/core/camel-core/src/test/java/org/apache/camel/issues/RouteStartupFailShouldStopAlsoIssueTest.java
index 6ab31700a85..00450cf8fde 100644
---
a/core/camel-core/src/test/java/org/apache/camel/issues/RouteStartupFailShouldStopAlsoIssueTest.java
+++
b/core/camel-core/src/test/java/org/apache/camel/issues/RouteStartupFailShouldStopAlsoIssueTest.java
@@ -92,7 +92,7 @@ public class RouteStartupFailShouldStopAlsoIssueTest extends
ContextTestSupport
}
}
- private class MyEndpoint extends DefaultEndpoint {
+ private static class MyEndpoint extends DefaultEndpoint {
public MyEndpoint(String endpointUri, Component component) {
super(endpointUri, component);
diff --git
a/core/camel-core/src/test/java/org/apache/camel/processor/ConsumerRouteIdAwareTest.java
b/core/camel-core/src/test/java/org/apache/camel/processor/ConsumerRouteIdAwareTest.java
index 9a0881089d7..130661812fc 100644
---
a/core/camel-core/src/test/java/org/apache/camel/processor/ConsumerRouteIdAwareTest.java
+++
b/core/camel-core/src/test/java/org/apache/camel/processor/ConsumerRouteIdAwareTest.java
@@ -65,7 +65,7 @@ public class ConsumerRouteIdAwareTest extends
ContextTestSupport {
}
}
- private class MyEndpoint extends DefaultEndpoint {
+ private static class MyEndpoint extends DefaultEndpoint {
public MyEndpoint(String endpointUri, Component component) {
super(endpointUri, component);
diff --git
a/core/camel-core/src/test/java/org/apache/camel/processor/PipelineStepWithEventTest.java
b/core/camel-core/src/test/java/org/apache/camel/processor/PipelineStepWithEventTest.java
index 0ab2014716b..4333cfba5a8 100644
---
a/core/camel-core/src/test/java/org/apache/camel/processor/PipelineStepWithEventTest.java
+++
b/core/camel-core/src/test/java/org/apache/camel/processor/PipelineStepWithEventTest.java
@@ -115,7 +115,7 @@ public class PipelineStepWithEventTest extends
ContextTestSupport {
}
- private class MyStepEventListener extends ServiceSupport implements
StepEventListener {
+ private static class MyStepEventListener extends ServiceSupport implements
StepEventListener {
private final List<EventObject> events = new ArrayList<>();
@@ -162,7 +162,7 @@ public class PipelineStepWithEventTest extends
ContextTestSupport {
}
}
- private class MyStepEventProcessor extends DelegateAsyncProcessor {
+ private static class MyStepEventProcessor extends DelegateAsyncProcessor {
private final StepEventListener listener;
private final String id;
diff --git
a/core/camel-core/src/test/java/org/apache/camel/support/IntrospectionSupportTest.java
b/core/camel-core/src/test/java/org/apache/camel/support/IntrospectionSupportTest.java
index 52c4ee91a33..075762ae0b3 100644
---
a/core/camel-core/src/test/java/org/apache/camel/support/IntrospectionSupportTest.java
+++
b/core/camel-core/src/test/java/org/apache/camel/support/IntrospectionSupportTest.java
@@ -141,7 +141,7 @@ public class IntrospectionSupportTest extends
ContextTestSupport {
}
}
- public class MyOtherBuilderBean extends MyBuilderBean {
+ public static class MyOtherBuilderBean extends MyBuilderBean {
}
public class MyOtherOtherBuilderBean extends MyOtherBuilderBean {
