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 88d7210ff2a40c3a339f2ab3932860bdb2561d84 Author: Otavio Rodolfo Piske <angusyo...@gmail.com> AuthorDate: Mon Apr 22 13:39:11 2024 +0200 (chores) camel-core: remove unused code --- .../camel/impl/cloud/ServiceRegistryTest.java | 4 ---- .../apache/camel/builder/xml/XPathFeatureTest.java | 21 --------------------- .../camel/cluster/ClusterServiceSelectorTest.java | 8 -------- .../cluster/ClusteredRoutePolicyFactoryTest.java | 8 -------- .../file/FileConsumerIdempotentRefTest.java | 1 - .../camel/impl/DataFormatContextAwareTest.java | 10 ---------- .../DefaultComponentReferencePropertiesTest.java | 5 ----- .../org/apache/camel/impl/RefDataFormatTest.java | 10 ---------- .../org/apache/camel/impl/RouteNoOutputTest.java | 1 - .../camel/impl/engine/DefaultCamelContextTest.java | 10 ---------- .../camel/processor/DataFormatServiceTest.java | 10 ---------- .../DeadLetterChannelUnmarshalSetHeaderTest.java | 10 ---------- .../camel/processor/PipelineStepWithEventTest.java | 10 ---------- .../camel/processor/RouteAwareProcessorTest.java | 10 ---------- .../apache/camel/processor/RouteAwareRouteTest.java | 10 ---------- .../camel/processor/UnmarshalProcessorTest.java | 10 ---------- .../AggregationStrategyLifecycleTest.java | 5 ----- .../AsyncEndpointEventNotifierSendingTest.java | 4 ---- .../errorhandler/ErrorHandlerSupportTest.java | 8 -------- .../camel/processor/resequencer/SequenceTest.java | 5 ----- .../processor/resequencer/TestComparatorTest.java | 5 ----- .../apache/camel/support/ServiceSupportTest.java | 21 --------------------- .../java/org/apache/camel/util/EventHelperTest.java | 8 -------- .../management/ManagedCustomProcessorTest.java | 10 ---------- .../management/ManagedNonManagedServiceTest.java | 18 ------------------ 25 files changed, 222 deletions(-) diff --git a/core/camel-cloud/src/test/java/org/apache/camel/impl/cloud/ServiceRegistryTest.java b/core/camel-cloud/src/test/java/org/apache/camel/impl/cloud/ServiceRegistryTest.java index 5a1237f8483..e5ff5c71875 100644 --- a/core/camel-cloud/src/test/java/org/apache/camel/impl/cloud/ServiceRegistryTest.java +++ b/core/camel-cloud/src/test/java/org/apache/camel/impl/cloud/ServiceRegistryTest.java @@ -206,10 +206,6 @@ public class ServiceRegistryTest extends ContextTestSupport { definitions.remove(definition.getId()); } - @Override - protected void doStart() { - } - @Override protected void doStop() { definitions.clear(); diff --git a/core/camel-core/src/test/java/org/apache/camel/builder/xml/XPathFeatureTest.java b/core/camel-core/src/test/java/org/apache/camel/builder/xml/XPathFeatureTest.java index 0a7880a551d..5da8da7b13c 100644 --- a/core/camel-core/src/test/java/org/apache/camel/builder/xml/XPathFeatureTest.java +++ b/core/camel-core/src/test/java/org/apache/camel/builder/xml/XPathFeatureTest.java @@ -26,7 +26,6 @@ import org.apache.camel.NoTypeConversionAvailableException; import org.apache.camel.RuntimeCamelException; import org.apache.camel.TypeConversionException; import org.apache.camel.converter.jaxp.XmlConverter; -import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.parallel.ResourceLock; import org.junit.jupiter.api.parallel.Resources; @@ -44,26 +43,6 @@ public class XPathFeatureTest extends ContextTestSupport { = " <!DOCTYPE foo [ " + " <!ELEMENT foo ANY > <!ENTITY xxe SYSTEM \"file:///bin/test.sh\" >]> <test> &xxe; </test><notwellformed>"; - @Override - @BeforeEach - public void setUp() throws Exception { - resetCoreConverters(); - super.setUp(); - } - - private void resetCoreConverters() { - /* - * Field field = - * CoreStaticTypeConverterLoader.class.getDeclaredField("INSTANCE"); - * field.setAccessible(true); Field modifiersField = - * Field.class.getDeclaredField("modifiers"); - * modifiersField.setAccessible(true); modifiersField.setInt(field, - * field.getModifiers() & ~Modifier.FINAL); Constructor<?> cns = - * CoreStaticTypeConverterLoader.class.getDeclaredConstructor(); - * cns.setAccessible(true); field.set(null, cns.newInstance()); - */ - } - @Override public boolean isUseRouteBuilder() { return false; 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 2048d0d10ae..0a0d19b92f5 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 @@ -384,14 +384,6 @@ public class ClusterServiceSelectorTest { return Collections.emptyList(); } - @Override - protected void doStart() { - } - - @Override - protected void doStop() { - } - private final class DummyClusterServiceMember implements CamelClusterMember { private final boolean leader; private final boolean local; diff --git a/core/camel-core/src/test/java/org/apache/camel/cluster/ClusteredRoutePolicyFactoryTest.java b/core/camel-core/src/test/java/org/apache/camel/cluster/ClusteredRoutePolicyFactoryTest.java index 20f06117060..288f011947a 100644 --- a/core/camel-core/src/test/java/org/apache/camel/cluster/ClusteredRoutePolicyFactoryTest.java +++ b/core/camel-core/src/test/java/org/apache/camel/cluster/ClusteredRoutePolicyFactoryTest.java @@ -174,14 +174,6 @@ public class ClusteredRoutePolicyFactoryTest extends ContextTestSupport { return Collections.emptyList(); } - @Override - protected void doStart() { - } - - @Override - protected void doStop() { - } - public boolean isLeader() { return leader; } diff --git a/core/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerIdempotentRefTest.java b/core/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerIdempotentRefTest.java index a9227945d83..9cc234c810f 100644 --- a/core/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerIdempotentRefTest.java +++ b/core/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerIdempotentRefTest.java @@ -112,7 +112,6 @@ public class FileConsumerIdempotentRefTest extends ContextTestSupport { @Override public void clear() { - return; } @Override diff --git a/core/camel-core/src/test/java/org/apache/camel/impl/DataFormatContextAwareTest.java b/core/camel-core/src/test/java/org/apache/camel/impl/DataFormatContextAwareTest.java index ebf4e18ac7e..60dbcddda27 100644 --- a/core/camel-core/src/test/java/org/apache/camel/impl/DataFormatContextAwareTest.java +++ b/core/camel-core/src/test/java/org/apache/camel/impl/DataFormatContextAwareTest.java @@ -75,15 +75,5 @@ public class DataFormatContextAwareTest extends ContextTestSupport { public Object unmarshal(Exchange exchange, InputStream stream) { return null; } - - @Override - protected void doStart() { - // noop - } - - @Override - protected void doStop() { - // noop - } } } 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 6ea18d40d6d..b4ede661aa4 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 @@ -16,7 +16,6 @@ */ package org.apache.camel.impl; -import java.util.List; import java.util.Map; import org.apache.camel.CamelContext; @@ -72,10 +71,6 @@ public class DefaultComponentReferencePropertiesTest extends ContextTestSupport return null; } - public void setExpression(List<?> expressions) { - // do nothing - } - public void setExpression(Expression expression) { this.expression = expression; } diff --git a/core/camel-core/src/test/java/org/apache/camel/impl/RefDataFormatTest.java b/core/camel-core/src/test/java/org/apache/camel/impl/RefDataFormatTest.java index 57c6da40329..6ebb7e6984c 100644 --- a/core/camel-core/src/test/java/org/apache/camel/impl/RefDataFormatTest.java +++ b/core/camel-core/src/test/java/org/apache/camel/impl/RefDataFormatTest.java @@ -95,16 +95,6 @@ public class RefDataFormatTest extends ContextTestSupport { } return sb.toString(); } - - @Override - protected void doStart() { - // noop - } - - @Override - protected void doStop() { - // noop - } } // END SNIPPET: e2 diff --git a/core/camel-core/src/test/java/org/apache/camel/impl/RouteNoOutputTest.java b/core/camel-core/src/test/java/org/apache/camel/impl/RouteNoOutputTest.java index 5163b71c6b1..fa23483fa08 100644 --- a/core/camel-core/src/test/java/org/apache/camel/impl/RouteNoOutputTest.java +++ b/core/camel-core/src/test/java/org/apache/camel/impl/RouteNoOutputTest.java @@ -37,7 +37,6 @@ public class RouteNoOutputTest extends ContextTestSupport { exception = e; } - } @Test diff --git a/core/camel-core/src/test/java/org/apache/camel/impl/engine/DefaultCamelContextTest.java b/core/camel-core/src/test/java/org/apache/camel/impl/engine/DefaultCamelContextTest.java index bfe2542da8d..a18335f5e9d 100644 --- a/core/camel-core/src/test/java/org/apache/camel/impl/engine/DefaultCamelContextTest.java +++ b/core/camel-core/src/test/java/org/apache/camel/impl/engine/DefaultCamelContextTest.java @@ -456,16 +456,6 @@ public class DefaultCamelContextTest extends TestSupport { public void setCamelContext(CamelContext camelContext) { this.camelContext = camelContext; } - - @Override - protected void doStart() { - // noop - } - - @Override - protected void doStop() { - // noop - } } } diff --git a/core/camel-core/src/test/java/org/apache/camel/processor/DataFormatServiceTest.java b/core/camel-core/src/test/java/org/apache/camel/processor/DataFormatServiceTest.java index 654d6059b95..7292ce34d64 100644 --- a/core/camel-core/src/test/java/org/apache/camel/processor/DataFormatServiceTest.java +++ b/core/camel-core/src/test/java/org/apache/camel/processor/DataFormatServiceTest.java @@ -113,16 +113,6 @@ public class DataFormatServiceTest extends ContextTestSupport { public Object unmarshal(Exchange exchange, InputStream stream) { return "Bye World"; } - - @Override - protected void doStart() { - // noop - } - - @Override - protected void doStop() { - // noop - } } // END SNIPPET: e2 } diff --git a/core/camel-core/src/test/java/org/apache/camel/processor/DeadLetterChannelUnmarshalSetHeaderTest.java b/core/camel-core/src/test/java/org/apache/camel/processor/DeadLetterChannelUnmarshalSetHeaderTest.java index 2894cee67e6..2817fa97f37 100644 --- a/core/camel-core/src/test/java/org/apache/camel/processor/DeadLetterChannelUnmarshalSetHeaderTest.java +++ b/core/camel-core/src/test/java/org/apache/camel/processor/DeadLetterChannelUnmarshalSetHeaderTest.java @@ -69,15 +69,5 @@ public class DeadLetterChannelUnmarshalSetHeaderTest extends ContextTestSupport public Object unmarshal(Exchange exchange, InputStream stream) { throw new IllegalArgumentException("Damn"); } - - @Override - protected void doStart() { - // noop - } - - @Override - protected void doStop() { - // noop - } } } 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 d307d448fd3..f8ee035c799 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 @@ -131,16 +131,6 @@ public class PipelineStepWithEventTest extends ContextTestSupport { public List<EventObject> getEvents() { return events; } - - @Override - protected void doStart() { - // noop - } - - @Override - protected void doStop() { - // noop - } } private static class MyInterceptStrategy implements InterceptStrategy { diff --git a/core/camel-core/src/test/java/org/apache/camel/processor/RouteAwareProcessorTest.java b/core/camel-core/src/test/java/org/apache/camel/processor/RouteAwareProcessorTest.java index dc2c8a9d21f..66fa899b63f 100644 --- a/core/camel-core/src/test/java/org/apache/camel/processor/RouteAwareProcessorTest.java +++ b/core/camel-core/src/test/java/org/apache/camel/processor/RouteAwareProcessorTest.java @@ -79,16 +79,6 @@ public class RouteAwareProcessorTest extends ContextTestSupport { public void process(Exchange exchange) { exchange.getMessage().setBody("Hello route " + routeId + " from processor " + id); } - - @Override - protected void doStart() { - // noop - } - - @Override - protected void doStop() { - // noop - } } } diff --git a/core/camel-core/src/test/java/org/apache/camel/processor/RouteAwareRouteTest.java b/core/camel-core/src/test/java/org/apache/camel/processor/RouteAwareRouteTest.java index 1aaebfd6f1f..210507e0a6c 100644 --- a/core/camel-core/src/test/java/org/apache/camel/processor/RouteAwareRouteTest.java +++ b/core/camel-core/src/test/java/org/apache/camel/processor/RouteAwareRouteTest.java @@ -64,15 +64,5 @@ public class RouteAwareRouteTest extends ContextTestSupport { public Route getRoute() { return route; } - - @Override - protected void doStart() { - // noop - } - - @Override - protected void doStop() { - // noop - } } } diff --git a/core/camel-core/src/test/java/org/apache/camel/processor/UnmarshalProcessorTest.java b/core/camel-core/src/test/java/org/apache/camel/processor/UnmarshalProcessorTest.java index 58fbe3487bc..77100c9aaa0 100644 --- a/core/camel-core/src/test/java/org/apache/camel/processor/UnmarshalProcessorTest.java +++ b/core/camel-core/src/test/java/org/apache/camel/processor/UnmarshalProcessorTest.java @@ -122,16 +122,6 @@ public class UnmarshalProcessorTest extends TestSupport { public Object unmarshal(Exchange exchange, InputStream stream) { return object; } - - @Override - protected void doStart() { - // noop - } - - @Override - protected void doStop() { - // noop - } } } diff --git a/core/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregationStrategyLifecycleTest.java b/core/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregationStrategyLifecycleTest.java index ac5a5a931f5..e59c603a8f9 100644 --- a/core/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregationStrategyLifecycleTest.java +++ b/core/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregationStrategyLifecycleTest.java @@ -95,10 +95,5 @@ public class AggregationStrategyLifecycleTest extends ContextTestSupport { separator = "+"; } - - @Override - protected void doStop() { - // noop - } } } diff --git a/core/camel-core/src/test/java/org/apache/camel/processor/async/AsyncEndpointEventNotifierSendingTest.java b/core/camel-core/src/test/java/org/apache/camel/processor/async/AsyncEndpointEventNotifierSendingTest.java index 51340a290e9..c141c1ba30e 100644 --- a/core/camel-core/src/test/java/org/apache/camel/processor/async/AsyncEndpointEventNotifierSendingTest.java +++ b/core/camel-core/src/test/java/org/apache/camel/processor/async/AsyncEndpointEventNotifierSendingTest.java @@ -68,10 +68,6 @@ public class AsyncEndpointEventNotifierSendingTest extends ContextTestSupport { public boolean isEnabled(CamelEvent event) { return event instanceof ExchangeSendingEvent || event instanceof ExchangeSentEvent; } - - @Override - protected void doStart() { - } }); return context; } diff --git a/core/camel-core/src/test/java/org/apache/camel/processor/errorhandler/ErrorHandlerSupportTest.java b/core/camel-core/src/test/java/org/apache/camel/processor/errorhandler/ErrorHandlerSupportTest.java index d05d40e7671..9e2232f2ceb 100644 --- a/core/camel-core/src/test/java/org/apache/camel/processor/errorhandler/ErrorHandlerSupportTest.java +++ b/core/camel-core/src/test/java/org/apache/camel/processor/errorhandler/ErrorHandlerSupportTest.java @@ -98,14 +98,6 @@ public class ErrorHandlerSupportTest extends ContextTestSupport { private static class ShuntErrorHandlerSupport extends ErrorHandlerSupport { - @Override - protected void doStart() { - } - - @Override - protected void doStop() { - } - @Override public boolean supportTransacted() { return false; diff --git a/core/camel-core/src/test/java/org/apache/camel/processor/resequencer/SequenceTest.java b/core/camel-core/src/test/java/org/apache/camel/processor/resequencer/SequenceTest.java index 105d54a90b1..cb60a9acb71 100644 --- a/core/camel-core/src/test/java/org/apache/camel/processor/resequencer/SequenceTest.java +++ b/core/camel-core/src/test/java/org/apache/camel/processor/resequencer/SequenceTest.java @@ -16,7 +16,6 @@ */ package org.apache.camel.processor.resequencer; -import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -42,10 +41,6 @@ public class SequenceTest { set.add(e2); } - @AfterEach - public void tearDown() { - } - @Test public void testPredecessor() { assertEquals(e1, set.predecessor(e2)); diff --git a/core/camel-core/src/test/java/org/apache/camel/processor/resequencer/TestComparatorTest.java b/core/camel-core/src/test/java/org/apache/camel/processor/resequencer/TestComparatorTest.java index 1fc65edf7bd..f29fcb5ccf1 100644 --- a/core/camel-core/src/test/java/org/apache/camel/processor/resequencer/TestComparatorTest.java +++ b/core/camel-core/src/test/java/org/apache/camel/processor/resequencer/TestComparatorTest.java @@ -16,7 +16,6 @@ */ package org.apache.camel.processor.resequencer; -import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -40,10 +39,6 @@ public class TestComparatorTest { e3 = new TestObject(7); } - @AfterEach - public void tearDown() { - } - @Test public void testPredecessor() { assertTrue(c.predecessor(e1, e2)); diff --git a/core/camel-core/src/test/java/org/apache/camel/support/ServiceSupportTest.java b/core/camel-core/src/test/java/org/apache/camel/support/ServiceSupportTest.java index 767a06eee7c..7f0e8a393f6 100644 --- a/core/camel-core/src/test/java/org/apache/camel/support/ServiceSupportTest.java +++ b/core/camel-core/src/test/java/org/apache/camel/support/ServiceSupportTest.java @@ -25,14 +25,6 @@ import static org.junit.jupiter.api.Assertions.*; public class ServiceSupportTest extends TestSupport { private static class MyService extends ServiceSupport { - - @Override - protected void doStart() { - } - - @Override - protected void doStop() { - } } @Test @@ -78,14 +70,6 @@ public class ServiceSupportTest extends TestSupport { private boolean shutdown; - @Override - protected void doStart() { - } - - @Override - protected void doStop() { - } - @Override protected void doShutdown() { shutdown = true; @@ -167,10 +151,5 @@ public class ServiceSupportTest extends TestSupport { protected void doStart() { throw new RuntimeException("This service throws an exception when starting"); } - - @Override - protected void doStop() { - } - } } diff --git a/core/camel-core/src/test/java/org/apache/camel/util/EventHelperTest.java b/core/camel-core/src/test/java/org/apache/camel/util/EventHelperTest.java index cb0b928b8db..ef62db89e7f 100644 --- a/core/camel-core/src/test/java/org/apache/camel/util/EventHelperTest.java +++ b/core/camel-core/src/test/java/org/apache/camel/util/EventHelperTest.java @@ -139,13 +139,5 @@ public class EventHelperTest { public boolean isEnabled(CamelEvent event) { return true; } - - @Override - protected void doStart() { - } - - @Override - protected void doStop() { - } } } diff --git a/core/camel-management/src/test/java/org/apache/camel/management/ManagedCustomProcessorTest.java b/core/camel-management/src/test/java/org/apache/camel/management/ManagedCustomProcessorTest.java index c53c30f56d2..2dab3a20088 100644 --- a/core/camel-management/src/test/java/org/apache/camel/management/ManagedCustomProcessorTest.java +++ b/core/camel-management/src/test/java/org/apache/camel/management/ManagedCustomProcessorTest.java @@ -94,16 +94,6 @@ public class ManagedCustomProcessorTest extends ManagementTestSupport { public void process(Exchange exchange) { exchange.getIn().setHeader("foo", getFoo()); } - - @Override - protected void doStart() { - // noop - } - - @Override - protected void doStop() { - // noop - } } // end::e1[] diff --git a/core/camel-management/src/test/java/org/apache/camel/management/ManagedNonManagedServiceTest.java b/core/camel-management/src/test/java/org/apache/camel/management/ManagedNonManagedServiceTest.java index 5bfe03f74fa..1f7e4e722cb 100644 --- a/core/camel-management/src/test/java/org/apache/camel/management/ManagedNonManagedServiceTest.java +++ b/core/camel-management/src/test/java/org/apache/camel/management/ManagedNonManagedServiceTest.java @@ -85,28 +85,10 @@ public class ManagedNonManagedServiceTest extends ManagementTestSupport { private static final class MyService extends ServiceSupport { - @Override - protected void doStart() { - // noop - } - - @Override - protected void doStop() { - // noop - } } private static final class MyNonService extends ServiceSupport implements NonManagedService { - @Override - protected void doStart() { - // noop - } - - @Override - protected void doStop() { - // noop - } } }