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
The following commit(s) were added to refs/heads/main by this push: new e5400700468 Regen e5400700468 is described below commit e5400700468a2f88b525dda5d597d338f1b911d6 Author: Claus Ibsen <claus.ib...@gmail.com> AuthorDate: Thu Jun 6 07:13:50 2024 +0200 Regen --- .../azure/servicebus/ServiceBusConfiguration.java | 4 +- .../operations/ServiceBusSenderOperations.java | 3 +- .../azure/servicebus/ServiceBusConsumerTest.java | 6 +- .../operations/ServiceBusSenderOperationsTest.java | 4 +- .../dhis2/api/Dhis2ResourceTablesTestCase.java | 2 +- .../DynamicRouterRecipientListHelperTest.java | 17 ++- .../KafkaBreakOnFirstErrorSeekIssueIT.java | 47 ++++---- .../apache/camel/openapi/RestOpenApiReader.java | 6 +- .../camel/opentelemetry/OpenTelemetryTracer.java | 3 +- .../org/apache/camel/component/qdrant/Qdrant.java | 3 +- .../qdrant/it/QdrantDeleteCollectionIT.java | 2 +- .../camel/component/smooks/SmooksComponent.java | 6 +- .../camel/component/smooks/SmooksEndpoint.java | 3 +- .../camel/component/smooks/SmooksProcessor.java | 24 ++-- .../smooks/converter/ResultConverter.java | 1 - .../smooks/converter/SourceConverter.java | 4 +- .../apache/camel/component/smooks/Coordinate.java | 1 - .../component/smooks/SmooksComponentTest.java | 10 +- .../component/smooks/SmooksProcessorTest.java | 45 ++++---- .../test/junit5/CamelContextConfiguration.java | 15 +-- .../camel/test/junit5/CamelContextManager.java | 13 ++- .../apache/camel/test/junit5/CamelTestSupport.java | 125 +++++++++++---------- .../test/junit5/LegacyCamelContextManager.java | 12 +- .../test/junit5/TestExecutionConfiguration.java | 15 +-- .../test/junit5/TransientCamelContextManager.java | 13 ++- .../test/junit5/util/CamelContextTestHelper.java | 1 - .../camel/test/patterns/DebugSpringTest.java | 1 - .../org/apache/camel/spi/EmbeddedHttpService.java | 4 +- .../camel/spi/RestClientRequestValidator.java | 16 +-- .../impl/engine/DefaultCamelContextExtension.java | 3 +- .../api/management/mbean/CamelOpenMBeanTypes.java | 3 +- .../DefaultRestClientRequestValidator.java | 7 +- .../camel/support/processor/RestBindingAdvice.java | 4 +- .../core/commands/catalog/CatalogBaseCommand.java | 2 +- .../jbang/core/commands/catalog/CatalogDoc.java | 4 +- .../camel/dsl/jbang/core/commands/k/Agent.java | 2 +- 36 files changed, 233 insertions(+), 198 deletions(-) diff --git a/components/camel-azure/camel-azure-servicebus/src/main/java/org/apache/camel/component/azure/servicebus/ServiceBusConfiguration.java b/components/camel-azure/camel-azure-servicebus/src/main/java/org/apache/camel/component/azure/servicebus/ServiceBusConfiguration.java index a0ddec8bc11..58e4df9ce58 100644 --- a/components/camel-azure/camel-azure-servicebus/src/main/java/org/apache/camel/component/azure/servicebus/ServiceBusConfiguration.java +++ b/components/camel-azure/camel-azure-servicebus/src/main/java/org/apache/camel/component/azure/servicebus/ServiceBusConfiguration.java @@ -151,8 +151,8 @@ public class ServiceBusConfiguration implements Cloneable, HeaderFilterStrategyA } /** - * Sets the proxy configuration to use for ServiceBusSenderClient. When a proxy is configured, AMQP_WEB_SOCKETS - * must be used for the transport type. + * Sets the proxy configuration to use for ServiceBusSenderClient. When a proxy is configured, AMQP_WEB_SOCKETS must + * be used for the transport type. */ public ProxyOptions getProxyOptions() { return proxyOptions; diff --git a/components/camel-azure/camel-azure-servicebus/src/main/java/org/apache/camel/component/azure/servicebus/operations/ServiceBusSenderOperations.java b/components/camel-azure/camel-azure-servicebus/src/main/java/org/apache/camel/component/azure/servicebus/operations/ServiceBusSenderOperations.java index 436f8c5fdad..7bf7b025de5 100644 --- a/components/camel-azure/camel-azure-servicebus/src/main/java/org/apache/camel/component/azure/servicebus/operations/ServiceBusSenderOperations.java +++ b/components/camel-azure/camel-azure-servicebus/src/main/java/org/apache/camel/component/azure/servicebus/operations/ServiceBusSenderOperations.java @@ -123,6 +123,7 @@ public class ServiceBusSenderOperations { return StreamSupport.stream(client.scheduleMessages(messages, scheduledEnqueueTime).spliterator(), false).toList(); } - return StreamSupport.stream(client.scheduleMessages(messages, scheduledEnqueueTime, context).spliterator(), false).toList(); + return StreamSupport.stream(client.scheduleMessages(messages, scheduledEnqueueTime, context).spliterator(), false) + .toList(); } } diff --git a/components/camel-azure/camel-azure-servicebus/src/test/java/org/apache/camel/component/azure/servicebus/ServiceBusConsumerTest.java b/components/camel-azure/camel-azure-servicebus/src/test/java/org/apache/camel/component/azure/servicebus/ServiceBusConsumerTest.java index 3d282bcc6c1..3c7a0be8bc5 100644 --- a/components/camel-azure/camel-azure-servicebus/src/test/java/org/apache/camel/component/azure/servicebus/ServiceBusConsumerTest.java +++ b/components/camel-azure/camel-azure-servicebus/src/test/java/org/apache/camel/component/azure/servicebus/ServiceBusConsumerTest.java @@ -97,11 +97,13 @@ public class ServiceBusConsumerTest { when(context.getCamelContextExtension()).thenReturn(ecc); when(ecc.getExchangeFactory()).thenReturn(ef); when(ef.newExchangeFactory(any())).thenReturn(ef); - when(ef.create(any(Endpoint.class), anyBoolean())).thenAnswer(invocationOnMock -> DefaultExchange.newFromEndpoint(invocationOnMock.getArgument(0))); + when(ef.create(any(Endpoint.class), anyBoolean())) + .thenAnswer(invocationOnMock -> DefaultExchange.newFromEndpoint(invocationOnMock.getArgument(0))); when(endpoint.getComponent()).thenReturn(component); when(endpoint.getConfiguration()).thenReturn(configuration); when(endpoint.getServiceBusClientFactory()).thenReturn(clientFactory); - when(clientFactory.createServiceBusProcessorClient(any(), processMessageCaptor.capture(), processErrorCaptor.capture())).thenReturn(client); + when(clientFactory.createServiceBusProcessorClient(any(), processMessageCaptor.capture(), processErrorCaptor.capture())) + .thenReturn(client); when(processor.process(exchangeCaptor.capture(), asyncCallbackCaptor.capture())).thenReturn(true); when(configuration.getHeaderFilterStrategy()).thenReturn(headerFilterStrategy); } diff --git a/components/camel-azure/camel-azure-servicebus/src/test/java/org/apache/camel/component/azure/servicebus/integration/operations/ServiceBusSenderOperationsTest.java b/components/camel-azure/camel-azure-servicebus/src/test/java/org/apache/camel/component/azure/servicebus/integration/operations/ServiceBusSenderOperationsTest.java index 4e495f36c57..c29a9ee3423 100644 --- a/components/camel-azure/camel-azure-servicebus/src/test/java/org/apache/camel/component/azure/servicebus/integration/operations/ServiceBusSenderOperationsTest.java +++ b/components/camel-azure/camel-azure-servicebus/src/test/java/org/apache/camel/component/azure/servicebus/integration/operations/ServiceBusSenderOperationsTest.java @@ -38,8 +38,8 @@ import static org.junit.jupiter.api.Assertions.assertThrows; import static org.junit.jupiter.api.Assertions.assertTrue; @EnabledIfSystemProperty(named = BaseServiceBusTestSupport.CONNECTION_STRING_PROPERTY_NAME, matches = ".*", - disabledReason = "Service Bus connection string must be supplied to run this test, e.g: mvn verify -D" - + BaseServiceBusTestSupport.CONNECTION_STRING_PROPERTY_NAME + "=connectionString") + disabledReason = "Service Bus connection string must be supplied to run this test, e.g: mvn verify -D" + + BaseServiceBusTestSupport.CONNECTION_STRING_PROPERTY_NAME + "=connectionString") public class ServiceBusSenderOperationsTest extends BaseServiceBusTestSupport { private static ServiceBusSenderClient client; diff --git a/components/camel-dhis2/camel-dhis2-api/src/test/java/org/apache/camel/component/dhis2/api/Dhis2ResourceTablesTestCase.java b/components/camel-dhis2/camel-dhis2-api/src/test/java/org/apache/camel/component/dhis2/api/Dhis2ResourceTablesTestCase.java index 4c65215232f..9bc613c3e04 100644 --- a/components/camel-dhis2/camel-dhis2-api/src/test/java/org/apache/camel/component/dhis2/api/Dhis2ResourceTablesTestCase.java +++ b/components/camel-dhis2/camel-dhis2-api/src/test/java/org/apache/camel/component/dhis2/api/Dhis2ResourceTablesTestCase.java @@ -56,7 +56,7 @@ public class Dhis2ResourceTablesTestCase { @Override public InputStream read() { - return new ByteArrayInputStream(new byte[]{}); + return new ByteArrayInputStream(new byte[] {}); } @Override diff --git a/components/camel-dynamic-router/src/test/java/org/apache/camel/component/dynamicrouter/routing/DynamicRouterRecipientListHelperTest.java b/components/camel-dynamic-router/src/test/java/org/apache/camel/component/dynamicrouter/routing/DynamicRouterRecipientListHelperTest.java index 09062722e5c..9cd622a9782 100644 --- a/components/camel-dynamic-router/src/test/java/org/apache/camel/component/dynamicrouter/routing/DynamicRouterRecipientListHelperTest.java +++ b/components/camel-dynamic-router/src/test/java/org/apache/camel/component/dynamicrouter/routing/DynamicRouterRecipientListHelperTest.java @@ -97,7 +97,8 @@ class DynamicRouterRecipientListHelperTest { @Test void testCreateBiFunctionAdapter() { when(mockConfig.isAggregationStrategyMethodAllowNull()).thenReturn(true); - AggregationStrategyBiFunctionAdapter result = DynamicRouterRecipientListHelper.createBiFunctionAdapter.apply(mockBiFunction, mockConfig); + AggregationStrategyBiFunctionAdapter result + = DynamicRouterRecipientListHelper.createBiFunctionAdapter.apply(mockBiFunction, mockConfig); assertNotNull(result); assertTrue(result.isAllowNullNewExchange()); assertTrue(result.isAllowNullOldExchange()); @@ -193,7 +194,7 @@ class DynamicRouterRecipientListHelperTest { when(mockConfig.getTimeout()).thenReturn(1000L); // Invoke the method under test Exception ex = assertThrows(IllegalArgumentException.class, - () ->DynamicRouterRecipientListHelper.setPropertiesForRecipientList(recipientList, camelContext, mockConfig)); + () -> DynamicRouterRecipientListHelper.setPropertiesForRecipientList(recipientList, camelContext, mockConfig)); assertEquals("Timeout is used but ParallelProcessing has not been enabled.", ex.getMessage()); } @@ -375,7 +376,8 @@ class DynamicRouterRecipientListHelperTest { void testGetConfiguredExecutorServiceWithExecutorServiceBean() { when(mockConfig.getExecutorServiceBean()).thenReturn(existingThreadPool); when(camelContext.getExecutorServiceManager()).thenReturn(manager); - ExecutorService result = DynamicRouterRecipientListHelper.getConfiguredExecutorService(camelContext, "someName", mockConfig, true); + ExecutorService result + = DynamicRouterRecipientListHelper.getConfiguredExecutorService(camelContext, "someName", mockConfig, true); assertEquals(existingThreadPool, result); } @@ -386,7 +388,8 @@ class DynamicRouterRecipientListHelperTest { when(camelContext.getRegistry()).thenReturn(mockRegistry); when(camelContext.getExecutorServiceManager()).thenReturn(manager); when(mockRegistry.lookupByNameAndType("existingThreadPool", ExecutorService.class)).thenReturn(existingThreadPool); - ExecutorService result = DynamicRouterRecipientListHelper.getConfiguredExecutorService(camelContext, "someName", mockConfig, true); + ExecutorService result + = DynamicRouterRecipientListHelper.getConfiguredExecutorService(camelContext, "someName", mockConfig, true); assertEquals(existingThreadPool, result); } @@ -403,7 +406,8 @@ class DynamicRouterRecipientListHelperTest { when(mockConfig.getExecutorService()).thenReturn(null); when(camelContext.getExecutorServiceManager()).thenReturn(manager); when(manager.newDefaultThreadPool(mockConfig, "someName")).thenReturn(newThreadPool); - ExecutorService result = DynamicRouterRecipientListHelper.getConfiguredExecutorService(camelContext, "someName", mockConfig, true); + ExecutorService result + = DynamicRouterRecipientListHelper.getConfiguredExecutorService(camelContext, "someName", mockConfig, true); assertEquals(newThreadPool, result); } @@ -412,7 +416,8 @@ class DynamicRouterRecipientListHelperTest { when(mockConfig.getExecutorServiceBean()).thenReturn(null); when(mockConfig.getExecutorService()).thenReturn(null); when(camelContext.getExecutorServiceManager()).thenReturn(manager); - ExecutorService result = DynamicRouterRecipientListHelper.getConfiguredExecutorService(camelContext, "someName", mockConfig, false); + ExecutorService result + = DynamicRouterRecipientListHelper.getConfiguredExecutorService(camelContext, "someName", mockConfig, false); assertNull(result); } diff --git a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaBreakOnFirstErrorSeekIssueIT.java b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaBreakOnFirstErrorSeekIssueIT.java index 290281135e0..93fb7c4e26f 100644 --- a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaBreakOnFirstErrorSeekIssueIT.java +++ b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaBreakOnFirstErrorSeekIssueIT.java @@ -77,17 +77,17 @@ class KafkaBreakOnFirstErrorSeekIssueIT extends BaseKafkaTestSupport { // create the topic w/ more than 1 partitions final NewTopic mytopic = new NewTopic(TOPIC, PARTITION_COUNT, (short) 1); - CreateTopicsResult r = kafkaAdminClient.createTopics(Collections.singleton(mytopic)); - - // This wait is necessary to ensure that required number of partitions are actually created - Awaitility.await() - .timeout(20, TimeUnit.SECONDS) - .pollDelay(5, TimeUnit.SECONDS) - .untilAsserted(() -> assertTrue(r.numPartitions(TOPIC).isDone())); + CreateTopicsResult r = kafkaAdminClient.createTopics(Collections.singleton(mytopic)); + + // This wait is necessary to ensure that required number of partitions are actually created + Awaitility.await() + .timeout(20, TimeUnit.SECONDS) + .pollDelay(5, TimeUnit.SECONDS) + .untilAsserted(() -> assertTrue(r.numPartitions(TOPIC).isDone())); } - @BeforeEach + @BeforeEach public void init() { // setup the producer @@ -105,23 +105,21 @@ class KafkaBreakOnFirstErrorSeekIssueIT extends BaseKafkaTestSupport { kafkaAdminClient.deleteTopics(Collections.singletonList(TOPIC)).all(); } - - @Test void testCamel19894TestFix() throws Exception { to.reset(); // will consume the payloads from partition 0 // and will continually retry the payload with "6" - // Changed from 4 to 5 to ensure that at least something gets read from partition 1 - to.expectedMessageCount(5); - - to.expectedBodiesReceived("1", "2", "3", "4", "5"); // message 6 onwards will not be received because of exception + breakOnFirstError=true - - contextExtension.getContext().getRouteController().stopRoute(ROUTE_ID); - - assertEquals(PARTITION_COUNT, producer.partitionsFor(TOPIC).size()); + // Changed from 4 to 5 to ensure that at least something gets read from partition 1 + to.expectedMessageCount(5); + + to.expectedBodiesReceived("1", "2", "3", "4", "5"); // message 6 onwards will not be received because of exception + breakOnFirstError=true + + contextExtension.getContext().getRouteController().stopRoute(ROUTE_ID); + + assertEquals(PARTITION_COUNT, producer.partitionsFor(TOPIC).size()); //Test relies on multiple partitions but expects the poller to stop reading after the errored message - // Increase the delay in setupTopic if this assert fails too frequently + // Increase the delay in setupTopic if this assert fails too frequently this.publishMessagesToKafka(); @@ -141,7 +139,7 @@ class KafkaBreakOnFirstErrorSeekIssueIT extends BaseKafkaTestSupport { @Override protected RouteBuilder createRouteBuilder() { - + return new RouteBuilder() { @Override @@ -183,19 +181,18 @@ class KafkaBreakOnFirstErrorSeekIssueIT extends BaseKafkaTestSupport { private void publishMessagesToKafka() { final List<String> producedRecordsPartition1 = List.of("5", "6", "7", "8", "9", "10", "11"); final List<String> producedRecordsPartition0 = List.of("1", "2", "3", "4"); - producedRecordsPartition0.forEach(v -> { ProducerRecord<String, String> data = new ProducerRecord<>(TOPIC, 0, "k0", v); //CAMEL-20680: kept explicit partition 0, added key. producer.send(data); }); - + producedRecordsPartition1.forEach(v -> { ProducerRecord<String, String> data = new ProducerRecord<>(TOPIC, 1, "k1", v); - producer.send(data); + producer.send(data); }); //CAMEL-20680: restored loop that publishes to partition1, but with reduced execution time - // See changes in setupTopic() and testCamel19894TestFix just before publishMessagesToKafka(). - // This loop is required by the original fix for CAMEL-19894 + // See changes in setupTopic() and testCamel19894TestFix just before publishMessagesToKafka(). + // This loop is required by the original fix for CAMEL-19894 } diff --git a/components/camel-openapi-java/src/main/java/org/apache/camel/openapi/RestOpenApiReader.java b/components/camel-openapi-java/src/main/java/org/apache/camel/openapi/RestOpenApiReader.java index dde1a809d59..1bb9bb74568 100644 --- a/components/camel-openapi-java/src/main/java/org/apache/camel/openapi/RestOpenApiReader.java +++ b/components/camel-openapi-java/src/main/java/org/apache/camel/openapi/RestOpenApiReader.java @@ -150,7 +150,8 @@ public class RestOpenApiReader { // contract first, then load the specification as-is and use as response for (RestDefinition rest : rests) { if (rest.getOpenApi() != null) { - Resource res = PluginHelper.getResourceLoader(camelContext).resolveResource(rest.getOpenApi().getSpecification()); + Resource res + = PluginHelper.getResourceLoader(camelContext).resolveResource(rest.getOpenApi().getSpecification()); if (res != null && res.exists()) { InputStream is = res.getInputStream(); String data = IOHelper.loadText(is); @@ -167,7 +168,8 @@ public class RestOpenApiReader { String scheme = "http"; int port = 0; host = RestComponentHelper.resolveRestHostName(host, restConfig); - EmbeddedHttpService server = CamelContextHelper.findSingleByType(camelContext, EmbeddedHttpService.class); + EmbeddedHttpService server + = CamelContextHelper.findSingleByType(camelContext, EmbeddedHttpService.class); if (server != null) { scheme = server.getScheme(); port = server.getServerPort(); diff --git a/components/camel-opentelemetry/src/main/java/org/apache/camel/opentelemetry/OpenTelemetryTracer.java b/components/camel-opentelemetry/src/main/java/org/apache/camel/opentelemetry/OpenTelemetryTracer.java index 86cfaa56cc2..03910d3c797 100644 --- a/components/camel-opentelemetry/src/main/java/org/apache/camel/opentelemetry/OpenTelemetryTracer.java +++ b/components/camel-opentelemetry/src/main/java/org/apache/camel/opentelemetry/OpenTelemetryTracer.java @@ -118,7 +118,8 @@ public class OpenTelemetryTracer extends org.apache.camel.tracing.Tracer { // GlobalOpenTelemetry.get() is always NotNull, falls back to OpenTelemetry.noop() tracer = GlobalOpenTelemetry.get().getTracer(instrumentationName); } - if (traceProcessors && (getTracingStrategy() == null || getTracingStrategy().getClass().isAssignableFrom(NoopTracingStrategy.class))) { + if (traceProcessors && (getTracingStrategy() == null + || getTracingStrategy().getClass().isAssignableFrom(NoopTracingStrategy.class))) { OpenTelemetryTracingStrategy tracingStrategy = new OpenTelemetryTracingStrategy(this); tracingStrategy.setPropagateContext(true); setTracingStrategy(tracingStrategy); diff --git a/components/camel-qdrant/src/main/java/org/apache/camel/component/qdrant/Qdrant.java b/components/camel-qdrant/src/main/java/org/apache/camel/component/qdrant/Qdrant.java index b2277177660..2a558b04645 100644 --- a/components/camel-qdrant/src/main/java/org/apache/camel/component/qdrant/Qdrant.java +++ b/components/camel-qdrant/src/main/java/org/apache/camel/component/qdrant/Qdrant.java @@ -25,7 +25,8 @@ public class Qdrant { } public static class Headers { - @Metadata(description = "The action to be performed.", javaType = "String", enums = "CREATE_COLLECTION,DELETE_COLLECTION,UPSERT,RETRIEVE,DELETE,COLLECTION_INFO") + @Metadata(description = "The action to be performed.", javaType = "String", + enums = "CREATE_COLLECTION,DELETE_COLLECTION,UPSERT,RETRIEVE,DELETE,COLLECTION_INFO") public static final String ACTION = "CamelQdrantAction"; @Metadata(description = "Payload Selector.", javaType = "io.qdrant.client.grpc.Points$WithPayloadSelector") diff --git a/components/camel-qdrant/src/test/java/org/apache/camel/component/qdrant/it/QdrantDeleteCollectionIT.java b/components/camel-qdrant/src/test/java/org/apache/camel/component/qdrant/it/QdrantDeleteCollectionIT.java index a3e2e1c8d7a..1158d701174 100644 --- a/components/camel-qdrant/src/test/java/org/apache/camel/component/qdrant/it/QdrantDeleteCollectionIT.java +++ b/components/camel-qdrant/src/test/java/org/apache/camel/component/qdrant/it/QdrantDeleteCollectionIT.java @@ -37,7 +37,7 @@ import static org.assertj.core.api.Assertions.assertThat; public class QdrantDeleteCollectionIT extends QdrantTestSupport { @EndpointInject("qdrant:collectionForDeletion") QdrantEndpoint qdrantEndpoint; - + @Test @Order(1) public void createCollection() { diff --git a/components/camel-smooks/src/main/java/org/apache/camel/component/smooks/SmooksComponent.java b/components/camel-smooks/src/main/java/org/apache/camel/component/smooks/SmooksComponent.java index cf2406bebc1..1de22821c99 100644 --- a/components/camel-smooks/src/main/java/org/apache/camel/component/smooks/SmooksComponent.java +++ b/components/camel-smooks/src/main/java/org/apache/camel/component/smooks/SmooksComponent.java @@ -35,8 +35,10 @@ public class SmooksComponent extends DefaultComponent { return endpoint; } - protected void configureSmooksProcessor(SmooksProcessor smooksProcessor, String uri, String remaining, - Map<String, Object> parameters) throws Exception { + protected void configureSmooksProcessor( + SmooksProcessor smooksProcessor, String uri, String remaining, + Map<String, Object> parameters) + throws Exception { setProperties(smooksProcessor, parameters); } diff --git a/components/camel-smooks/src/main/java/org/apache/camel/component/smooks/SmooksEndpoint.java b/components/camel-smooks/src/main/java/org/apache/camel/component/smooks/SmooksEndpoint.java index 29e6df5b160..8e44af53eab 100644 --- a/components/camel-smooks/src/main/java/org/apache/camel/component/smooks/SmooksEndpoint.java +++ b/components/camel-smooks/src/main/java/org/apache/camel/component/smooks/SmooksEndpoint.java @@ -27,7 +27,8 @@ import org.apache.camel.support.service.ServiceHelper; /** * EDI, XML, CSV, etc. based data transformation using Smooks. */ -@UriEndpoint(firstVersion = "4.7.0", scheme = "smooks", title = "Smooks", syntax = "smooks:smooksConfig", category = { Category.TRANSFORMATION }) +@UriEndpoint(firstVersion = "4.7.0", scheme = "smooks", title = "Smooks", syntax = "smooks:smooksConfig", + category = { Category.TRANSFORMATION }) public class SmooksEndpoint extends ProcessorEndpoint { @UriPath(description = "Smooks XML configuration file") diff --git a/components/camel-smooks/src/main/java/org/apache/camel/component/smooks/SmooksProcessor.java b/components/camel-smooks/src/main/java/org/apache/camel/component/smooks/SmooksProcessor.java index 259c7072ae3..1464347362a 100644 --- a/components/camel-smooks/src/main/java/org/apache/camel/component/smooks/SmooksProcessor.java +++ b/components/camel-smooks/src/main/java/org/apache/camel/component/smooks/SmooksProcessor.java @@ -134,9 +134,12 @@ public class SmooksProcessor extends ServiceSupport implements Processor, CamelC private void setupSmooksReporting(final ExecutionContext executionContext) { if (reportPath != null) { try { - executionContext.getContentDeliveryRuntime().addExecutionEventListener(new HtmlReportGenerator(reportPath, executionContext.getApplicationContext())); + executionContext.getContentDeliveryRuntime().addExecutionEventListener( + new HtmlReportGenerator(reportPath, executionContext.getApplicationContext())); } catch (final IOException e) { - LOG.warn("Cannot generate Smooks Report. The reportPath specified was [" + reportPath + "]. This exception is ignored.", e); + LOG.warn("Cannot generate Smooks Report. The reportPath specified was [" + reportPath + + "]. This exception is ignored.", + e); } } } @@ -144,7 +147,6 @@ public class SmooksProcessor extends ServiceSupport implements Processor, CamelC private Source getSource(final Exchange exchange) { Object payload = exchange.getIn().getBody(); - if (payload instanceof SAXSource) { return new StreamSource((Reader) ((SAXSource) payload).getXMLReader()); } @@ -183,9 +185,9 @@ public class SmooksProcessor extends ServiceSupport implements Processor, CamelC /** * Add a visitor instance. * - * @param visitor The visitor implementation. - * @param targetSelector The message fragment target selector. - * @return This instance. + * @param visitor The visitor implementation. + * @param targetSelector The message fragment target selector. + * @return This instance. */ public SmooksProcessor addVisitor(Visitor visitor, String targetSelector) { selectorVisitorMap.put(targetSelector, visitor); @@ -193,11 +195,10 @@ public class SmooksProcessor extends ServiceSupport implements Processor, CamelC } /** - * Add a visitor instance to <code>this</code> Smooks instance via a - * {@link VisitorAppender}. + * Add a visitor instance to <code>this</code> Smooks instance via a {@link VisitorAppender}. * - * @param appender The visitor appender. - * @return This instance. + * @param appender The visitor appender. + * @return This instance. */ public SmooksProcessor addVisitor(VisitorAppender appender) { visitorAppender.add(appender); @@ -209,7 +210,8 @@ public class SmooksProcessor extends ServiceSupport implements Processor, CamelC } private Smooks createSmooks() { - final SmooksFactory smooksFactory = (SmooksFactory) camelContext.getRegistry().lookupByName(SmooksFactory.class.getName()); + final SmooksFactory smooksFactory + = (SmooksFactory) camelContext.getRegistry().lookupByName(SmooksFactory.class.getName()); return smooksFactory != null ? smooksFactory.createInstance() : new Smooks(); } diff --git a/components/camel-smooks/src/main/java/org/apache/camel/component/smooks/converter/ResultConverter.java b/components/camel-smooks/src/main/java/org/apache/camel/component/smooks/converter/ResultConverter.java index 06897d8f8fb..c467e81333b 100644 --- a/components/camel-smooks/src/main/java/org/apache/camel/component/smooks/converter/ResultConverter.java +++ b/components/camel-smooks/src/main/java/org/apache/camel/component/smooks/converter/ResultConverter.java @@ -79,7 +79,6 @@ public class ResultConverter { return result.getResult(); } - @SuppressWarnings("rawtypes") public static Map toMap(JavaResult.ResultMap resultBeans, Exchange exchange) { Message outMessage = exchange.getOut(); diff --git a/components/camel-smooks/src/main/java/org/apache/camel/component/smooks/converter/SourceConverter.java b/components/camel-smooks/src/main/java/org/apache/camel/component/smooks/converter/SourceConverter.java index d44bf129246..47333c9b63b 100644 --- a/components/camel-smooks/src/main/java/org/apache/camel/component/smooks/converter/SourceConverter.java +++ b/components/camel-smooks/src/main/java/org/apache/camel/component/smooks/converter/SourceConverter.java @@ -30,8 +30,8 @@ import org.smooks.io.payload.JavaSource; import org.smooks.io.payload.JavaSourceWithoutEventStream; /** - * SourceConverter is a Camel {@link Converter} that converts from different - * formats to {@link Source} instances. </p> + * SourceConverter is a Camel {@link Converter} that converts from different formats to {@link Source} instances. + * </p> */ @Converter(generateLoader = true) public class SourceConverter { diff --git a/components/camel-smooks/src/test/java/org/apache/camel/component/smooks/Coordinate.java b/components/camel-smooks/src/test/java/org/apache/camel/component/smooks/Coordinate.java index af4c1af02fd..a5ffe11d84e 100644 --- a/components/camel-smooks/src/test/java/org/apache/camel/component/smooks/Coordinate.java +++ b/components/camel-smooks/src/test/java/org/apache/camel/component/smooks/Coordinate.java @@ -74,5 +74,4 @@ public class Coordinate { return "Coordinate [x=" + x + ", y=" + y + "]"; } - } diff --git a/components/camel-smooks/src/test/java/org/apache/camel/component/smooks/SmooksComponentTest.java b/components/camel-smooks/src/test/java/org/apache/camel/component/smooks/SmooksComponentTest.java index 44fcc9b252e..21d5d1bb519 100644 --- a/components/camel-smooks/src/test/java/org/apache/camel/component/smooks/SmooksComponentTest.java +++ b/components/camel-smooks/src/test/java/org/apache/camel/component/smooks/SmooksComponentTest.java @@ -45,12 +45,9 @@ public class SmooksComponentTest extends CamelTestSupport { Exchange exchange = mockEndpoint.assertExchangeReceived(0); assertIsInstanceOf(Document.class, exchange.getIn().getBody()); - assertFalse(DiffBuilder.compare(StreamUtils.readStreamAsString(getClass().getResourceAsStream("/xml/expected-order.xml"), "UTF-8")). - withTest(exchange.getIn().getBody(String.class)). - ignoreComments(). - ignoreWhitespace(). - build(). - hasDifferences()); + assertFalse(DiffBuilder + .compare(StreamUtils.readStreamAsString(getClass().getResourceAsStream("/xml/expected-order.xml"), "UTF-8")) + .withTest(exchange.getIn().getBody(String.class)).ignoreComments().ignoreWhitespace().build().hasDifferences()); } @Override @@ -64,4 +61,3 @@ public class SmooksComponentTest extends CamelTestSupport { }; } } - diff --git a/components/camel-smooks/src/test/java/org/apache/camel/component/smooks/SmooksProcessorTest.java b/components/camel-smooks/src/test/java/org/apache/camel/component/smooks/SmooksProcessorTest.java index 82afff24154..503728f1e7f 100644 --- a/components/camel-smooks/src/test/java/org/apache/camel/component/smooks/SmooksProcessorTest.java +++ b/components/camel-smooks/src/test/java/org/apache/camel/component/smooks/SmooksProcessorTest.java @@ -86,11 +86,8 @@ public class SmooksProcessorTest extends CamelTestSupport { Exchange exchange = result.assertExchangeReceived(0); assertIsInstanceOf(Document.class, exchange.getIn().getBody()); - assertFalse(DiffBuilder.compare(getExpectedOrderXml()).withTest(exchange.getIn().getBody(String.class)). - ignoreComments(). - ignoreWhitespace(). - build(). - hasDifferences()); + assertFalse(DiffBuilder.compare(getExpectedOrderXml()).withTest(exchange.getIn().getBody(String.class)).ignoreComments() + .ignoreWhitespace().build().hasDifferences()); } @Test @@ -112,7 +109,8 @@ public class SmooksProcessorTest extends CamelTestSupport { template.send("direct://input", exchange); - final DataHandler datahandler = result.assertExchangeReceived(0).getIn(AttachmentMessage.class).getAttachment(attachmentId); + final DataHandler datahandler + = result.assertExchangeReceived(0).getIn(AttachmentMessage.class).getAttachment(attachmentId); assertThat(datahandler, is(notNullValue())); assertThat(datahandler.getContent(), is(instanceOf(ByteArrayInputStream.class))); @@ -139,7 +137,9 @@ public class SmooksProcessorTest extends CamelTestSupport { Smooks smooks = new Smooks().setExports(new Exports(JavaResult.class)); from("direct:a") .process(new SmooksProcessor(smooks, context) - .addVisitor(new Value("customer", "/order/header/customer", String.class, smooks.getApplicationContext().getRegistry()))); + .addVisitor(new Value( + "customer", "/order/header/customer", String.class, + smooks.getApplicationContext().getRegistry()))); } }); @@ -160,9 +160,9 @@ public class SmooksProcessorTest extends CamelTestSupport { deleteDirectory("target/smooks"); context.addRoutes(new RouteBuilder() { public void configure() { - from("file://target/smooks"). - process(new SmooksProcessor(new Smooks().setExports(new Exports(StringResult.class)), context)). - to("mock:a"); + from("file://target/smooks") + .process(new SmooksProcessor(new Smooks().setExports(new Exports(StringResult.class)), context)) + .to("mock:a"); } }); context.start(); @@ -184,12 +184,14 @@ public class SmooksProcessorTest extends CamelTestSupport { public void configure() { from("direct:a") .process(new SmooksProcessor(smooks, context) - .addVisitor(new Value("x", "/coord/@x", Integer.class, smooks.getApplicationContext().getRegistry()))); + .addVisitor(new Value( + "x", "/coord/@x", Integer.class, smooks.getApplicationContext().getRegistry()))); } }); enableJMX(); context.start(); - Exchange response = template.request("direct:a", exchange -> exchange.getIn().setBody(new StringSource("<coord x='1234' />"))); + Exchange response + = template.request("direct:a", exchange -> exchange.getIn().setBody(new StringSource("<coord x='1234' />"))); assertEquals(1234, response.getMessage().getBody(Integer.class)); } @@ -199,13 +201,14 @@ public class SmooksProcessorTest extends CamelTestSupport { context.addRoutes(new RouteBuilder() { @Override public void configure() throws Exception { - from("direct:b").process(new SmooksProcessor(smooks, context). - addVisitor(new Value("x", "/coord/@x", Integer.class, smooks.getApplicationContext().getRegistry())). - addVisitor(new Value("y", "/coord/@y", Double.class, smooks.getApplicationContext().getRegistry()))); + from("direct:b").process(new SmooksProcessor(smooks, context) + .addVisitor(new Value("x", "/coord/@x", Integer.class, smooks.getApplicationContext().getRegistry())) + .addVisitor(new Value("y", "/coord/@y", Double.class, smooks.getApplicationContext().getRegistry()))); } }); context.start(); - Exchange response = template.request("direct:b", exchange -> exchange.getIn().setBody(new StringSource("<coord x='1234' y='98765.76' />"))); + Exchange response = template.request("direct:b", + exchange -> exchange.getIn().setBody(new StringSource("<coord x='1234' y='98765.76' />"))); Map javaResult = response.getOut().getBody(Map.class); Integer x = (Integer) javaResult.get("x"); assertEquals(1234, (int) x); @@ -219,14 +222,14 @@ public class SmooksProcessorTest extends CamelTestSupport { context.addRoutes(new RouteBuilder() { @Override public void configure() { - from("direct:c").process(new SmooksProcessor(smooks, context). - addVisitor(new Bean(Coordinate.class, "coordinate", smooks.getApplicationContext().getRegistry()). - bindTo("x", "/coord/@x"). - bindTo("y", "/coord/@y"))); + from("direct:c").process(new SmooksProcessor(smooks, context) + .addVisitor(new Bean(Coordinate.class, "coordinate", smooks.getApplicationContext().getRegistry()) + .bindTo("x", "/coord/@x").bindTo("y", "/coord/@y"))); } }); context.start(); - Exchange response = template.request("direct:c", exchange -> exchange.getIn().setBody(new StringSource("<coord x='111' y='222' />"))); + Exchange response = template.request("direct:c", + exchange -> exchange.getIn().setBody(new StringSource("<coord x='111' y='222' />"))); Coordinate coord = response.getMessage().getBody(Coordinate.class); diff --git a/components/camel-test/camel-test-junit5/src/main/java/org/apache/camel/test/junit5/CamelContextConfiguration.java b/components/camel-test/camel-test-junit5/src/main/java/org/apache/camel/test/junit5/CamelContextConfiguration.java index e07c7595197..aaf6cbcbd21 100644 --- a/components/camel-test/camel-test-junit5/src/main/java/org/apache/camel/test/junit5/CamelContextConfiguration.java +++ b/components/camel-test/camel-test-junit5/src/main/java/org/apache/camel/test/junit5/CamelContextConfiguration.java @@ -54,7 +54,6 @@ public final class CamelContextConfiguration { void postSetup() throws Exception; } - private String routeFilterIncludePattern; private String routeFilterExcludePattern; private Registry registry; @@ -129,8 +128,8 @@ public final class CamelContextConfiguration { /** * Sets a custom {@link Registry}. * <p> - * However, if you need to bind beans to the registry, then this is possible already with the bind method on registry, - * and there is no need to use this method. + * However, if you need to bind beans to the registry, then this is possible already with the bind method on + * registry, and there is no need to use this method. */ public CamelContextConfiguration withRegistry(Registry registry) { this.registry = registry; @@ -210,9 +209,9 @@ public final class CamelContextConfiguration { * Whether to ignore missing locations with the {@link PropertiesComponent}. For example, when unit testing, you may * want to ignore locations that are not available in the environment used for testing. * - * @param ignoreMissingLocationWithPropertiesComponent Use <tt>true</tt> to ignore, <tt>false</tt> to not ignore, and - * <tt>null</tt> to leave it - * as configured on the {@link PropertiesComponent} + * @param ignoreMissingLocationWithPropertiesComponent Use <tt>true</tt> to ignore, <tt>false</tt> to not ignore, + * and <tt>null</tt> to leave it as configured on the + * {@link PropertiesComponent} */ public CamelContextConfiguration withIgnoreMissingLocationWithPropertiesComponent( Boolean ignoreMissingLocationWithPropertiesComponent) { @@ -226,6 +225,7 @@ public final class CamelContextConfiguration { /** * To set a supplier for the CamelContext + * * @param camelContextSupplier A supplier for the Camel context */ CamelContextConfiguration withCamelContextSupplier( @@ -238,7 +238,6 @@ public final class CamelContextConfiguration { return registryBinder; } - /** * A supplier to create a custom {@link Registry}. * <p> @@ -298,6 +297,7 @@ public final class CamelContextConfiguration { /** * To replace from routes with a different one + * * @param routeId * @param fromEndpoint */ @@ -311,6 +311,7 @@ public final class CamelContextConfiguration { /** * Set set a custom post-test processor + * * @param postProcessor the post-test processor to use */ CamelContextConfiguration withPostProcessor( diff --git a/components/camel-test/camel-test-junit5/src/main/java/org/apache/camel/test/junit5/CamelContextManager.java b/components/camel-test/camel-test-junit5/src/main/java/org/apache/camel/test/junit5/CamelContextManager.java index 4f9eac5a024..8738ddde481 100644 --- a/components/camel-test/camel-test-junit5/src/main/java/org/apache/camel/test/junit5/CamelContextManager.java +++ b/components/camel-test/camel-test-junit5/src/main/java/org/apache/camel/test/junit5/CamelContextManager.java @@ -31,44 +31,51 @@ public interface CamelContextManager { /** * Creates a new CamelContext - * @param test the test instance requesting the next context + * + * @param test the test instance requesting the next context * @throws Exception if unable to create the context */ void createCamelContext(Object test) throws Exception; /** * A callback method to be executed before starting the context - * @param test + * + * @param test * @throws Exception */ void beforeContextStart(Object test) throws Exception; /** * Gets the reference to the CamelContext instance + * * @return the CamelContext instance */ ModelCamelContext context(); /** * Gets the reference to the producer template created during initialization + * * @return the producer template instance */ ProducerTemplate template(); /** * Gets the reference to the fluent producer template created during initialization + * * @return the fluent producer template instance */ FluentProducerTemplate fluentTemplate(); /** * Gets the reference to the consumer template created during initialization + * * @return the consumer template instance */ ConsumerTemplate consumer(); /** * When a separate service is used to manage the context lifecycle, this returns the reference to that service + * * @return the reference to the context lifecycle service */ @Deprecated(since = "4.7.0") @@ -76,6 +83,7 @@ public interface CamelContextManager { /** * Starts the context + * * @throws Exception if unable to start the context for any reason */ void startCamelContext() throws Exception; @@ -97,6 +105,7 @@ public interface CamelContextManager { /** * Sets the JUnit's data context that may be used to provide additional information for some tests + * * @param globalStore JUnit's data context instance */ void setGlobalStore(ExtensionContext.Store globalStore); 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 ac72f16e041..d908b8a0428 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 @@ -96,25 +96,24 @@ public abstract class CamelTestSupport private CamelContextManager contextManager; protected CamelTestSupport() { - testConfigurationBuilder = new TestExecutionConfiguration(); - testConfigurationBuilder.withJMX(useJmx()) - .withUseRouteBuilder(isUseRouteBuilder()) - .withUseAdviceWith(isUseAdviceWith()) - .withDumpRouteCoverage(isDumpRouteCoverage()); - - - camelContextConfiguration = new CamelContextConfiguration(); - - camelContextConfiguration - .withCamelContextSupplier(this::createCamelContext) - .withRegistryBinder(this::bindToRegistry) - .withPostProcessor(this::postProcessTest) - .withRoutesSupplier(this::createRouteBuilders) - .withUseOverridePropertiesWithPropertiesComponent(useOverridePropertiesWithPropertiesComponent()) - .withRouteFilterExcludePattern(getRouteFilterExcludePattern()) - .withRouteFilterIncludePattern(getRouteFilterIncludePattern()) - .withMockEndpoints(isMockEndpoints()) - .withMockEndpointsAndSkip(isMockEndpointsAndSkip()); + testConfigurationBuilder = new TestExecutionConfiguration(); + testConfigurationBuilder.withJMX(useJmx()) + .withUseRouteBuilder(isUseRouteBuilder()) + .withUseAdviceWith(isUseAdviceWith()) + .withDumpRouteCoverage(isDumpRouteCoverage()); + + camelContextConfiguration = new CamelContextConfiguration(); + + camelContextConfiguration + .withCamelContextSupplier(this::createCamelContext) + .withRegistryBinder(this::bindToRegistry) + .withPostProcessor(this::postProcessTest) + .withRoutesSupplier(this::createRouteBuilders) + .withUseOverridePropertiesWithPropertiesComponent(useOverridePropertiesWithPropertiesComponent()) + .withRouteFilterExcludePattern(getRouteFilterExcludePattern()) + .withRouteFilterIncludePattern(getRouteFilterIncludePattern()) + .withMockEndpoints(isMockEndpoints()) + .withMockEndpointsAndSkip(isMockEndpointsAndSkip()); } @Override @@ -152,7 +151,8 @@ public abstract class CamelTestSupport @Override public void beforeAll(ExtensionContext context) { - final boolean perClassPresent = context.getTestInstanceLifecycle().filter(lc -> lc.equals(Lifecycle.PER_CLASS)).isPresent(); + final boolean perClassPresent + = context.getTestInstanceLifecycle().filter(lc -> lc.equals(Lifecycle.PER_CLASS)).isPresent(); if (perClassPresent) { LOG.trace("Creating a legacy context manager for {}", context.getDisplayName()); testConfigurationBuilder.withCreateCamelContextPerClass(perClassPresent); @@ -172,8 +172,8 @@ public abstract class CamelTestSupport * Use the RouteBuilder or not * * @deprecated Use the accessors from {@link #testConfiguration()} method - * @return <tt>true</tt> then {@link CamelContext} will be auto started, <tt>false</tt> then {@link CamelContext} - * will <b>not</b> be auto started (you will have to start it manually) + * @return <tt>true</tt> then {@link CamelContext} will be auto started, <tt>false</tt> then + * {@link CamelContext} will <b>not</b> be auto started (you will have to start it manually) */ @Deprecated(since = "4.7.0") public boolean isUseRouteBuilder() { @@ -195,8 +195,8 @@ public abstract class CamelTestSupport * <tt>CamelTestRouteCoverage=true</tt>. * * @deprecated Use the accessors from {@link #testConfiguration()} method - * @return <tt>true</tt> to write route coverage status in an xml file in the <tt>target/camel-route-coverage</tt> - * directory after the test has finished. + * @return <tt>true</tt> to write route coverage status in an xml file in the + * <tt>target/camel-route-coverage</tt> directory after the test has finished. */ @Deprecated(since = "4.7.0") public boolean isDumpRouteCoverage() { @@ -213,7 +213,7 @@ public abstract class CamelTestSupport * doing all the advice with. * * @deprecated Use the accessors from {@link #testConfiguration()} method - * @return <tt>true</tt> if you use advice with in your unit tests. + * @return <tt>true</tt> if you use advice with in your unit tests. */ @Deprecated(since = "4.7.0") public boolean isUseAdviceWith() { @@ -233,7 +233,7 @@ public abstract class CamelTestSupport * methods in that given order. * * @deprecated Use the accessors from {@link #testConfiguration()} method - * @return <tt>true</tt> per class, <tt>false</tt> per test. + * @return <tt>true</tt> per class, <tt>false</tt> per test. */ @Deprecated(since = "4.7.0") protected final boolean isCreateCamelContextPerClass() { @@ -245,7 +245,7 @@ public abstract class CamelTestSupport * <p/> * Return <tt>*</tt> to mock all endpoints. * - * @see EndpointHelper#matchEndpoint(CamelContext, String, String) + * @see EndpointHelper#matchEndpoint(CamelContext, String, String) * @deprecated Use the accessors from {@link #camelContextConfiguration()} method */ @Deprecated(since = "4.7.0") @@ -258,7 +258,7 @@ public abstract class CamelTestSupport * <p/> * Return <tt>*</tt> to mock all endpoints. * - * @see EndpointHelper#matchEndpoint(CamelContext, String, String) + * @see EndpointHelper#matchEndpoint(CamelContext, String, String) * @deprecated Use the accessors from {@link #camelContextConfiguration()} method */ @Deprecated(since = "4.7.0") @@ -268,9 +268,10 @@ public abstract class CamelTestSupport /** * To replace from routes - * @param routeId - * @param fromEndpoint - * @deprecated Use the accessors from {@link #camelContextConfiguration()} method + * + * @param routeId + * @param fromEndpoint + * @deprecated Use the accessors from {@link #camelContextConfiguration()} method */ @Deprecated(since = "4.7.0") public void replaceRouteFromWith(String routeId, String fromEndpoint) { @@ -328,6 +329,7 @@ public abstract class CamelTestSupport * Override to enable debugger * <p/> * Is default <tt>false</tt> + * * @deprecated Use the accessors from {@link #testConfiguration()} method */ @Deprecated(since = "4.7.0") @@ -355,8 +357,9 @@ public abstract class CamelTestSupport } /** - * Sets the CamelContext. Used by the manager to override tests that try to access the context - * during setup. DO NOT USE. + * Sets the CamelContext. Used by the manager to override tests that try to access the context during setup. DO NOT + * USE. + * * @param context */ @Deprecated(since = "4.7.0") @@ -387,8 +390,8 @@ public abstract class CamelTestSupport /** * Common test setup. For internal use. * - * @deprecated Use {@link #setupResources()} instead - * @throws Exception if unable to setup the test + * @deprecated Use {@link #setupResources()} instead + * @throws Exception if unable to setup the test */ @Deprecated(since = "4.7.0") @BeforeEach @@ -470,7 +473,6 @@ public abstract class CamelTestSupport throw new UnsupportedOperationException("Do not use the doSetUp method"); } - private boolean isRouteCoverageEnabled() { return Boolean.parseBoolean(System.getProperty(ROUTE_COVERAGE_ENABLED, "false")) || isDumpRouteCoverage(); } @@ -478,8 +480,8 @@ public abstract class CamelTestSupport /** * Common test tear down. For internal use. * - * @deprecated Use {@link #cleanupResources()} instead - * @throws Exception if unable to setup the test + * @deprecated Use {@link #cleanupResources()} instead + * @throws Exception if unable to setup the test */ @Deprecated(since = "4.7.0") @AfterEach @@ -507,8 +509,9 @@ public abstract class CamelTestSupport } /** - * Strategy to perform any post-action, after {@link CamelContext} is stopped. - * This is meant for internal Camel usage and should not be used by user classes. + * Strategy to perform any post-action, after {@link CamelContext} is stopped. This is meant for internal Camel + * usage and should not be used by user classes. + * * @deprecated use {@link #cleanupResources()} instead. */ @Deprecated(since = "4.7.0") @@ -517,9 +520,9 @@ public abstract class CamelTestSupport } /** - * Strategy to set up resources, before {@link CamelContext} is created. - * This is meant to be used by resources that must be available before the context is created. - * Do not use this as a replacement for tasks that can be handled using JUnit's annotations. + * Strategy to set up resources, before {@link CamelContext} is created. This is meant to be used by resources that + * must be available before the context is created. Do not use this as a replacement for tasks that can be handled + * using JUnit's annotations. */ protected void setupResources() throws Exception { } @@ -537,7 +540,7 @@ public abstract class CamelTestSupport * Will default use 10 seconds. * * @deprecated use the accessors from {@link #camelContextConfiguration()} - * @return the timeout to use + * @return the timeout to use */ @Deprecated(since = "4.7.0") protected int getShutdownTimeout() { @@ -548,7 +551,7 @@ public abstract class CamelTestSupport * Whether JMX should be used during testing. * * @deprecated Use the methods {@link #testConfiguration()} to enable, disable or check JMX state. - * @return <tt>false</tt> by default. + * @return <tt>false</tt> by default. */ @Deprecated(since = "4.7.0") protected boolean useJmx() { @@ -559,7 +562,7 @@ public abstract class CamelTestSupport * Override this method to include and override properties with the Camel {@link PropertiesComponent}. * * @deprecated Use the accessors from {@link #camelContextConfiguration()} method - * @return additional properties to add/override. + * @return additional properties to add/override. */ @Deprecated(since = "4.7.0") protected Properties useOverridePropertiesWithPropertiesComponent() { @@ -571,8 +574,8 @@ public abstract class CamelTestSupport * want to ignore locations that are not available in the environment used for testing. * * @deprecated Use the accessors from {@link #camelContextConfiguration()} method - * @return <tt>true</tt> to ignore, <tt>false</tt> to not ignore, and <tt>null</tt> to leave as configured on the - * {@link PropertiesComponent} + * @return <tt>true</tt> to ignore, <tt>false</tt> to not ignore, and <tt>null</tt> to leave as configured on + * the {@link PropertiesComponent} */ @Deprecated(since = "4.7.0") protected Boolean ignoreMissingLocationWithPropertiesComponent() { @@ -582,8 +585,8 @@ public abstract class CamelTestSupport /** * Internal method. Do not use. * - * @deprecated use {@link #setupResources()} or the JUnit's annotation instead of this method - * @throws Exception + * @deprecated use {@link #setupResources()} or the JUnit's annotation instead of this method + * @throws Exception */ @Deprecated(since = "4.7.0") protected void postProcessTest() throws Exception { @@ -659,7 +662,7 @@ public abstract class CamelTestSupport * Factory method which derived classes can use to create an array of {@link org.apache.camel.builder.RouteBuilder}s * to define the routes for testing * - * @see #createRouteBuilder() + * @see #createRouteBuilder() * @deprecated This method will be made private. Do not use */ @Deprecated(since = "4.7.0") @@ -670,9 +673,9 @@ public abstract class CamelTestSupport /** * Resolves a mandatory endpoint for the given URI or an exception is thrown * - * @param uri the Camel <a href="">URI</a> to use to create or resolve an endpoint - * @return the endpoint - * @deprecated Use the methods from {@link TestSupport} + * @param uri the Camel <a href="">URI</a> to use to create or resolve an endpoint + * @return the endpoint + * @deprecated Use the methods from {@link TestSupport} */ @Deprecated(since = "4.7.0") protected final Endpoint resolveMandatoryEndpoint(String uri) { @@ -682,9 +685,9 @@ public abstract class CamelTestSupport /** * Resolves a mandatory endpoint for the given URI and expected type or an exception is thrown * - * @param uri the Camel <a href="">URI</a> to use to create or resolve an endpoint - * @return the endpoint - * @deprecated Use the methods from {@link TestSupport} + * @param uri the Camel <a href="">URI</a> to use to create or resolve an endpoint + * @return the endpoint + * @deprecated Use the methods from {@link TestSupport} */ @Deprecated(since = "4.7.0") protected final <T extends Endpoint> T resolveMandatoryEndpoint(String uri, Class<T> endpointType) { @@ -812,8 +815,9 @@ public abstract class CamelTestSupport /** * Asserts the validity of the context - * @deprecated Use JUnit's assertions if needed - * @param context + * + * @deprecated Use JUnit's assertions if needed + * @param context */ @Deprecated(since = "4.7.0") protected final void assertValidContext(CamelContext context) { @@ -834,6 +838,7 @@ public abstract class CamelTestSupport /** * Disables the JMX agent. Must be called before the {@link #setUp()} method. + * * @deprecated Use the methods {@link #testConfiguration()} to enable, disable or check JMX state. */ @Deprecated(since = "4.7.0") @@ -874,6 +879,7 @@ public abstract class CamelTestSupport /** * Gets the {@link TestExecutionConfiguration} test execution configuration instance for the test + * * @return the configuration instance for the test */ public final TestExecutionConfiguration testConfiguration() { @@ -882,6 +888,7 @@ public abstract class CamelTestSupport /** * Gets the {@link CamelContextConfiguration} for the test + * * @return the camel context configuration */ public final CamelContextConfiguration camelContextConfiguration() { diff --git a/components/camel-test/camel-test-junit5/src/main/java/org/apache/camel/test/junit5/LegacyCamelContextManager.java b/components/camel-test/camel-test-junit5/src/main/java/org/apache/camel/test/junit5/LegacyCamelContextManager.java index fb8df863bb4..1e9508ace64 100644 --- a/components/camel-test/camel-test-junit5/src/main/java/org/apache/camel/test/junit5/LegacyCamelContextManager.java +++ b/components/camel-test/camel-test-junit5/src/main/java/org/apache/camel/test/junit5/LegacyCamelContextManager.java @@ -65,7 +65,7 @@ public class LegacyCamelContextManager implements CamelContextManager { private ExtensionContext.Store globalStore; public LegacyCamelContextManager(TestExecutionConfiguration testConfigurationBuilder, - CamelContextConfiguration camelContextConfiguration) { + CamelContextConfiguration camelContextConfiguration) { this.testConfigurationBuilder = testConfigurationBuilder; this.camelContextConfiguration = camelContextConfiguration; @@ -119,7 +119,8 @@ public class LegacyCamelContextManager implements CamelContextManager { // jmx is enabled if we have configured to use it, if dump route coverage is enabled (it requires JMX) or if // the component camel-debug is in the classpath - if (testConfigurationBuilder.isJmxEnabled() || testConfigurationBuilder.isRouteCoverageEnabled() || isCamelDebugPresent()) { + if (testConfigurationBuilder.isJmxEnabled() || testConfigurationBuilder.isRouteCoverageEnabled() + || isCamelDebugPresent()) { enableJMX(); } else { disableJMX(); @@ -200,7 +201,6 @@ public class LegacyCamelContextManager implements CamelContextManager { CamelContextTestHelper.configurePropertiesComponent(context, extra, new JunitPropertiesSource(globalStore), ignore); } - private void setupRoutes() throws Exception { RoutesBuilder[] builders = camelContextConfiguration.routesSupplier().createRouteBuilders(); @@ -212,7 +212,8 @@ public class LegacyCamelContextManager implements CamelContextManager { private void tryStartCamelContext() throws Exception { boolean skip = CamelContextTestHelper.isSkipAutoStartContext(testConfigurationBuilder); if (skip) { - LOG.info("Skipping starting CamelContext as system property skipStartingCamelContext is set to be true or auto start context is false."); + LOG.info( + "Skipping starting CamelContext as system property skipStartingCamelContext is set to be true or auto start context is false."); } else if (testConfigurationBuilder.isUseAdviceWith()) { LOG.info("Skipping starting CamelContext as isUseAdviceWith is set to true."); } else { @@ -336,7 +337,8 @@ public class LegacyCamelContextManager implements CamelContextManager { protected void applyCamelPostProcessor(Object test) throws Exception { // use the bean post processor if the test class is not dependency // injected already by Spring Framework - boolean spring = ExtensionHelper.hasClassAnnotation(test.getClass(), "org.springframework.context.annotation.ComponentScan"); + boolean spring + = ExtensionHelper.hasClassAnnotation(test.getClass(), "org.springframework.context.annotation.ComponentScan"); if (!spring) { PluginHelper.getBeanPostProcessor(context).postProcessBeforeInitialization(test, test.getClass().getName()); diff --git a/components/camel-test/camel-test-junit5/src/main/java/org/apache/camel/test/junit5/TestExecutionConfiguration.java b/components/camel-test/camel-test-junit5/src/main/java/org/apache/camel/test/junit5/TestExecutionConfiguration.java index 430c675fff6..0ccf7023e0d 100644 --- a/components/camel-test/camel-test-junit5/src/main/java/org/apache/camel/test/junit5/TestExecutionConfiguration.java +++ b/components/camel-test/camel-test-junit5/src/main/java/org/apache/camel/test/junit5/TestExecutionConfiguration.java @@ -67,8 +67,8 @@ public class TestExecutionConfiguration { * You can also turn on route coverage globally via setting JVM system property * <tt>CamelTestRouteCoverage=true</tt>. * - * @param dumpRouteCoverage <tt>true</tt> to write route coverage status in an xml file in the <tt>target/camel-route-coverage</tt> - * directory after the test has finished. + * @param dumpRouteCoverage <tt>true</tt> to write route coverage status in an xml file in the + * <tt>target/camel-route-coverage</tt> directory after the test has finished. */ public TestExecutionConfiguration withDumpRouteCoverage(boolean dumpRouteCoverage) { this.dumpRouteCoverage = dumpRouteCoverage; @@ -85,8 +85,8 @@ public class TestExecutionConfiguration { } /** - * Set when using <a href="http://camel.apache.org/advicewith.html">advice with</a> and return <tt>true</tt>. - * This helps to know that advice with is to be used, and {@link CamelContext} will not be started before the advice with + * Set when using <a href="http://camel.apache.org/advicewith.html">advice with</a> and return <tt>true</tt>. This + * helps to know that advice with is to be used, and {@link CamelContext} will not be started before the advice with * takes place. This helps by ensuring the advice with has been property setup before the {@link CamelContext} is * started * <p/> @@ -116,7 +116,7 @@ public class TestExecutionConfiguration { * <p/> * * @deprecated Do not use - * @return <tt>true</tt> per class, <tt>false</tt> per test. + * @return <tt>true</tt> per class, <tt>false</tt> per test. */ @Deprecated(since = "4.7.0") TestExecutionConfiguration withCreateCamelContextPerClass(boolean createCamelContextPerClass) { @@ -145,8 +145,9 @@ public class TestExecutionConfiguration { /** * Sets to auto-start the context of not. - * @param autoStartContext - * @deprecated Do not use + * + * @param autoStartContext + * @deprecated Do not use */ @Deprecated(since = "4.7.0") public TestExecutionConfiguration withAutoStartContext(boolean autoStartContext) { diff --git a/components/camel-test/camel-test-junit5/src/main/java/org/apache/camel/test/junit5/TransientCamelContextManager.java b/components/camel-test/camel-test-junit5/src/main/java/org/apache/camel/test/junit5/TransientCamelContextManager.java index 20e9fd934af..b5a66eb9aaf 100644 --- a/components/camel-test/camel-test-junit5/src/main/java/org/apache/camel/test/junit5/TransientCamelContextManager.java +++ b/components/camel-test/camel-test-junit5/src/main/java/org/apache/camel/test/junit5/TransientCamelContextManager.java @@ -52,7 +52,7 @@ public class TransientCamelContextManager implements CamelContextManager { private ExtensionContext.Store globalStore; public TransientCamelContextManager(TestExecutionConfiguration testConfigurationBuilder, - CamelContextConfiguration camelContextConfiguration) { + CamelContextConfiguration camelContextConfiguration) { this.testConfigurationBuilder = testConfigurationBuilder; this.camelContextConfiguration = camelContextConfiguration; @@ -64,7 +64,6 @@ public class TransientCamelContextManager implements CamelContextManager { initialize(test); } - @Override public void beforeContextStart(Object test) throws Exception { applyCamelPostProcessor(test); @@ -76,7 +75,8 @@ public class TransientCamelContextManager implements CamelContextManager { // jmx is enabled if we have configured to use it, or if dump route coverage is enabled (it requires JMX) or if // the component camel-debug is in the classpath - if (testConfigurationBuilder.isJmxEnabled() || testConfigurationBuilder.isRouteCoverageEnabled() || isCamelDebugPresent()) { + if (testConfigurationBuilder.isJmxEnabled() || testConfigurationBuilder.isRouteCoverageEnabled() + || isCamelDebugPresent()) { enableJMX(); } else { disableJMX(); @@ -151,7 +151,6 @@ public class TransientCamelContextManager implements CamelContextManager { CamelContextTestHelper.configurePropertiesComponent(context, extra, new JunitPropertiesSource(globalStore), ignore); } - private void setupRoutes() throws Exception { RoutesBuilder[] builders = camelContextConfiguration.routesSupplier().createRouteBuilders(); @@ -163,7 +162,8 @@ public class TransientCamelContextManager implements CamelContextManager { private void tryStartCamelContext() throws Exception { boolean skip = CamelContextTestHelper.isSkipAutoStartContext(testConfigurationBuilder); if (skip) { - LOG.info("Skipping starting CamelContext as system property skipStartingCamelContext is set to be true or auto start context is false."); + LOG.info( + "Skipping starting CamelContext as system property skipStartingCamelContext is set to be true or auto start context is false."); } else if (testConfigurationBuilder.isUseAdviceWith()) { LOG.info("Skipping starting CamelContext as isUseAdviceWith is set to true."); } else { @@ -257,7 +257,8 @@ public class TransientCamelContextManager implements CamelContextManager { protected void applyCamelPostProcessor(Object test) throws Exception { // use the bean post processor if the test class is not dependency // injected already by Spring Framework - boolean spring = ExtensionHelper.hasClassAnnotation(test.getClass(), "org.springframework.context.annotation.ComponentScan"); + boolean spring + = ExtensionHelper.hasClassAnnotation(test.getClass(), "org.springframework.context.annotation.ComponentScan"); if (!spring) { PluginHelper.getBeanPostProcessor(context).postProcessBeforeInitialization(test, test.getClass().getName()); diff --git a/components/camel-test/camel-test-junit5/src/main/java/org/apache/camel/test/junit5/util/CamelContextTestHelper.java b/components/camel-test/camel-test-junit5/src/main/java/org/apache/camel/test/junit5/util/CamelContextTestHelper.java index ea4cef06a23..27057c068d1 100644 --- a/components/camel-test/camel-test-junit5/src/main/java/org/apache/camel/test/junit5/util/CamelContextTestHelper.java +++ b/components/camel-test/camel-test-junit5/src/main/java/org/apache/camel/test/junit5/util/CamelContextTestHelper.java @@ -232,7 +232,6 @@ public final class CamelContextTestHelper { } } - public static boolean isSkipAutoStartContext(TestExecutionConfiguration configuration) { return Boolean.parseBoolean(System.getProperty("skipStartingCamelContext")) || !configuration.autoStartContext(); } diff --git a/components/camel-test/camel-test-spring-junit5/src/test/java/org/apache/camel/test/patterns/DebugSpringTest.java b/components/camel-test/camel-test-spring-junit5/src/test/java/org/apache/camel/test/patterns/DebugSpringTest.java index 30ea9d1561a..ebaa82a7eb6 100644 --- a/components/camel-test/camel-test-spring-junit5/src/test/java/org/apache/camel/test/patterns/DebugSpringTest.java +++ b/components/camel-test/camel-test-spring-junit5/src/test/java/org/apache/camel/test/patterns/DebugSpringTest.java @@ -36,7 +36,6 @@ public class DebugSpringTest extends CamelSpringTestSupport { private static final Logger LOG = LoggerFactory.getLogger(DebugSpringTest.class); private boolean debugged; - @Override public void doPreSetup() throws Exception { super.doPreSetup(); diff --git a/core/camel-api/src/main/java/org/apache/camel/spi/EmbeddedHttpService.java b/core/camel-api/src/main/java/org/apache/camel/spi/EmbeddedHttpService.java index c3e432b3f82..668b8879a25 100644 --- a/core/camel-api/src/main/java/org/apache/camel/spi/EmbeddedHttpService.java +++ b/core/camel-api/src/main/java/org/apache/camel/spi/EmbeddedHttpService.java @@ -17,8 +17,8 @@ package org.apache.camel.spi; /** - * Information about embedded HTTP server such as when using the camel-platform-http component, - * that integrates with the Spring Boot or Quarkus HTTP server. + * Information about embedded HTTP server such as when using the camel-platform-http component, that integrates with the + * Spring Boot or Quarkus HTTP server. */ public interface EmbeddedHttpService { diff --git a/core/camel-api/src/main/java/org/apache/camel/spi/RestClientRequestValidator.java b/core/camel-api/src/main/java/org/apache/camel/spi/RestClientRequestValidator.java index a07ed516eeb..9470e2ba01b 100644 --- a/core/camel-api/src/main/java/org/apache/camel/spi/RestClientRequestValidator.java +++ b/core/camel-api/src/main/java/org/apache/camel/spi/RestClientRequestValidator.java @@ -51,19 +51,19 @@ public interface RestClientRequestValidator { * @param requiredHeaders names of HTTP headers parameters that are required */ record ValidationContext(String consumes, String produces, - boolean requiredBody, - Map<String, String> queryDefaultValues, - Map<String, String> queryAllowedValues, - Set<String> requiredQueryParameters, - Set<String> requiredHeaders) { + boolean requiredBody, + Map<String, String> queryDefaultValues, + Map<String, String> queryAllowedValues, + Set<String> requiredQueryParameters, + Set<String> requiredHeaders) { } /** * Validates the incoming client request * - * @param exchange the current exchange - * @param validationContent validation context - * @return the validation error, or <tt>null</tt> if success + * @param exchange the current exchange + * @param validationContent validation context + * @return the validation error, or <tt>null</tt> if success */ ValidationError validate(Exchange exchange, ValidationContext validationContent); diff --git a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultCamelContextExtension.java b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultCamelContextExtension.java index 40410b2915e..a5cffbd9248 100644 --- a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultCamelContextExtension.java +++ b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultCamelContextExtension.java @@ -789,7 +789,8 @@ class DefaultCamelContextExtension implements ExtendedCamelContext { @Override public void setEndpointServiceRegistry(EndpointServiceRegistry endpointServiceRegistry) { - this.endpointServiceRegistry = camelContext.getInternalServiceManager().addService(camelContext, endpointServiceRegistry); + this.endpointServiceRegistry + = camelContext.getInternalServiceManager().addService(camelContext, endpointServiceRegistry); } ValidatorRegistry getValidatorRegistry() { diff --git a/core/camel-management-api/src/main/java/org/apache/camel/api/management/mbean/CamelOpenMBeanTypes.java b/core/camel-management-api/src/main/java/org/apache/camel/api/management/mbean/CamelOpenMBeanTypes.java index bcbd593836a..abe3a9de8f6 100644 --- a/core/camel-management-api/src/main/java/org/apache/camel/api/management/mbean/CamelOpenMBeanTypes.java +++ b/core/camel-management-api/src/main/java/org/apache/camel/api/management/mbean/CamelOpenMBeanTypes.java @@ -33,7 +33,8 @@ public final class CamelOpenMBeanTypes { public static TabularType listEndpointServicesTabularType() throws OpenDataException { CompositeType ct = listEndpointServicesCompositeType(); return new TabularType( - "listEndpointServices", "Lists all the endpoint services in the registry", ct, new String[] { "component", "dir", "serviceUrl", "endpointUri" }); + "listEndpointServices", "Lists all the endpoint services in the registry", ct, + new String[] { "component", "dir", "serviceUrl", "endpointUri" }); } public static CompositeType listEndpointServicesCompositeType() throws OpenDataException { diff --git a/core/camel-support/src/main/java/org/apache/camel/support/processor/DefaultRestClientRequestValidator.java b/core/camel-support/src/main/java/org/apache/camel/support/processor/DefaultRestClientRequestValidator.java index 756cfe0a426..7494c8fc505 100644 --- a/core/camel-support/src/main/java/org/apache/camel/support/processor/DefaultRestClientRequestValidator.java +++ b/core/camel-support/src/main/java/org/apache/camel/support/processor/DefaultRestClientRequestValidator.java @@ -45,13 +45,13 @@ public class DefaultRestClientRequestValidator implements RestClientRequestValid } // check for required query parameters if (validationContext.requiredQueryParameters() != null - && !exchange.getIn().getHeaders().keySet().containsAll(validationContext.requiredQueryParameters())) { + && !exchange.getIn().getHeaders().keySet().containsAll(validationContext.requiredQueryParameters())) { // this is a bad request, the client did not include some required query parameters return new ValidationError(400, "Some of the required query parameters are missing."); } // check for required http headers if (validationContext.requiredHeaders() != null - && !exchange.getIn().getHeaders().keySet().containsAll(validationContext.requiredHeaders())) { + && !exchange.getIn().getHeaders().keySet().containsAll(validationContext.requiredHeaders())) { // this is a bad request, the client did not include some required query parameters return new ValidationError(400, "Some of the required HTTP headers are missing."); } @@ -64,7 +64,8 @@ public class DefaultRestClientRequestValidator implements RestClientRequestValid String[] parts = e.getValue().split(","); if (Arrays.stream(parts).noneMatch(v::equals)) { // this is a bad request, the client did not include some required query parameters - return new ValidationError(400, "Some of the query parameters or HTTP headers has a not-allowed value."); + return new ValidationError( + 400, "Some of the query parameters or HTTP headers has a not-allowed value."); } } } diff --git a/core/camel-support/src/main/java/org/apache/camel/support/processor/RestBindingAdvice.java b/core/camel-support/src/main/java/org/apache/camel/support/processor/RestBindingAdvice.java index 32b5bc27775..cccd750610b 100644 --- a/core/camel-support/src/main/java/org/apache/camel/support/processor/RestBindingAdvice.java +++ b/core/camel-support/src/main/java/org/apache/camel/support/processor/RestBindingAdvice.java @@ -224,7 +224,9 @@ public class RestBindingAdvice extends ServiceSupport implements CamelInternalPr // perform client request validation if (clientRequestValidation) { - RestClientRequestValidator.ValidationContext vc = new RestClientRequestValidator.ValidationContext(consumes, produces, requiredBody, queryDefaultValues, queryAllowedValues, requiredQueryParameters, requiredHeaders); + RestClientRequestValidator.ValidationContext vc = new RestClientRequestValidator.ValidationContext( + consumes, produces, requiredBody, queryDefaultValues, queryAllowedValues, requiredQueryParameters, + requiredHeaders); RestClientRequestValidator.ValidationError error = clientRequestValidator.validate(exchange, vc); if (error != null) { exchange.getMessage().setHeader(Exchange.HTTP_RESPONSE_CODE, error.statusCode()); diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/catalog/CatalogBaseCommand.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/catalog/CatalogBaseCommand.java index 60707493625..14bb324403e 100644 --- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/catalog/CatalogBaseCommand.java +++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/catalog/CatalogBaseCommand.java @@ -53,7 +53,7 @@ public abstract class CatalogBaseCommand extends CamelCommand { String quarkusVersion; @CommandLine.Option(names = { "--quarkus-group-id" }, description = "Quarkus Platform Maven groupId", - defaultValue = "io.quarkus.platform") + defaultValue = "io.quarkus.platform") String quarkusGroupId = "io.quarkus.platform"; @CommandLine.Option(names = { "--repos" }, diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/catalog/CatalogDoc.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/catalog/CatalogDoc.java index fd819cf02be..b527120ed9d 100644 --- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/catalog/CatalogDoc.java +++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/catalog/CatalogDoc.java @@ -64,11 +64,11 @@ public class CatalogDoc extends CamelCommand { String runtime; @CommandLine.Option(names = { "--quarkus-version" }, description = "Quarkus Platform version", - defaultValue = "3.11.0") + defaultValue = "3.11.0") String quarkusVersion; @CommandLine.Option(names = { "--quarkus-group-id" }, description = "Quarkus Platform Maven groupId", - defaultValue = "io.quarkus.platform") + defaultValue = "io.quarkus.platform") String quarkusGroupId = "io.quarkus.platform"; @CommandLine.Option(names = { "--repos" }, diff --git a/dsl/camel-jbang/camel-jbang-plugin-k/src/main/java/org/apache/camel/dsl/jbang/core/commands/k/Agent.java b/dsl/camel-jbang/camel-jbang-plugin-k/src/main/java/org/apache/camel/dsl/jbang/core/commands/k/Agent.java index d1bded58728..0743e204e08 100644 --- a/dsl/camel-jbang/camel-jbang-plugin-k/src/main/java/org/apache/camel/dsl/jbang/core/commands/k/Agent.java +++ b/dsl/camel-jbang/camel-jbang-plugin-k/src/main/java/org/apache/camel/dsl/jbang/core/commands/k/Agent.java @@ -135,7 +135,7 @@ public class Agent extends CamelCommand { String repos; @CommandLine.Option(names = { "--quarkus-group-id" }, description = "Quarkus Platform Maven groupId", - defaultValue = "io.quarkus.platform") + defaultValue = "io.quarkus.platform") String quarkusGroupId = "io.quarkus.platform"; public Agent(CamelJBangMain main) {