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 89d8f6d CAMEL-17645: rename modeLine to modeline
89d8f6d is described below
commit 89d8f6d2a765bb4847419245bcb3f6ead21da78a
Author: Claus Ibsen <claus.ib...@gmail.com>
AuthorDate: Tue Feb 15 23:29:01 2022 +0100
CAMEL-17645: rename modeLine to modeline
---
.../main/camel-main-configuration-metadata.json | 1 -
.../main/java/org/apache/camel/CamelContext.java | 4 +-
.../org/apache/camel/ExtendedCamelContext.java | 10 ++--
.../{ModeLineFactory.java => ModelineFactory.java} | 4 +-
.../camel/impl/engine/AbstractCamelContext.java | 30 +++++------
.../camel/impl/engine/DefaultRoutesLoader.java | 8 +--
.../camel/impl/engine/SimpleCamelContext.java | 12 ++---
.../camel/impl/ExtendedCamelContextConfigurer.java | 18 +++----
.../camel/impl/lw/LightweightCamelContext.java | 18 +++----
.../impl/lw/LightweightRuntimeCamelContext.java | 16 +++---
.../MainConfigurationPropertiesConfigurer.java | 6 ---
.../camel-main-configuration-metadata.json | 1 -
core/camel-main/src/main/docs/main.adoc | 3 +-
.../org/apache/camel/main/BaseMainSupport.java | 2 +-
.../camel/main/DefaultConfigurationConfigurer.java | 2 +-
.../camel/main/DefaultConfigurationProperties.java | 14 ++---
.../org/apache/camel/main/RoutesConfigurer.java | 18 +++----
docs/components/modules/others/nav.adoc | 2 +-
.../services/org/apache/camel/dsl-modeline-factory | 2 +-
.../src/main/docs/dsl-modeline.adoc | 4 +-
...ineFactory.java => DefaultModelineFactory.java} | 10 ++--
.../java/org/apache/camel/dsl/modeline/Trait.java | 2 +-
.../camel/dsl/modeline/ModelineParserTest.java | 61 ++++++++--------------
.../apache/camel/dsl/jbang/core/commands/Run.java | 2 +-
dsl/camel-jbang/camel-jbang-main/README.md | 2 +-
.../java/org/apache/camel/main/ModelineTest.java | 2 +-
26 files changed, 110 insertions(+), 144 deletions(-)
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/main/camel-main-configuration-metadata.json
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/main/camel-main-configuration-metadata.json
index 8c0377f..e5dc1a5 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/main/camel-main-configuration-metadata.json
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/main/camel-main-configuration-metadata.json
@@ -59,7 +59,6 @@
{ "name": "camel.main.logMask", "description": "Sets whether log mask is
enabled or not. Default is false.", "sourceType":
"org.apache.camel.main.DefaultConfigurationProperties", "type": "boolean",
"javaType": "boolean", "defaultValue": "false" },
{ "name": "camel.main.mdcLoggingKeysPattern", "description": "Sets the
pattern used for determine which custom MDC keys to propagate during message
routing when the routing engine continues routing asynchronously for the given
message. Setting this pattern to will propagate all custom keys. Or setting the
pattern to foo,bar will propagate any keys starting with either foo or bar.
Notice that a set of standard Camel MDC keys are always propagated which starts
with camel. as key name. [...]
{ "name": "camel.main.messageHistory", "description": "Sets whether
message history is enabled or not. Default is false.", "sourceType":
"org.apache.camel.main.DefaultConfigurationProperties", "type": "boolean",
"javaType": "boolean", "defaultValue": "false" },
- { "name": "camel.main.modeLine", "description": "Whether camel-k style
modeline is also enabled when not using camel-k. Enabling this allows to use a
camel-k like experience by being able to configure various settings using
modeline directly in your route source code.", "sourceType":
"org.apache.camel.main.DefaultConfigurationProperties", "type": "boolean",
"javaType": "boolean", "defaultValue": "false" },
{ "name": "camel.main.name", "description": "Sets the name of the
CamelContext.", "sourceType":
"org.apache.camel.main.DefaultConfigurationProperties", "type": "string",
"javaType": "java.lang.String" },
{ "name": "camel.main.producerTemplateCacheSize", "description": "Producer
template endpoints cache size.", "sourceType":
"org.apache.camel.main.DefaultConfigurationProperties", "type": "integer",
"javaType": "int", "defaultValue": 1000 },
{ "name": "camel.main.routeControllerBackOffDelay", "description":
"Backoff delay in millis when restarting a route that failed to startup.",
"sourceType": "org.apache.camel.main.DefaultConfigurationProperties", "type":
"integer", "javaType": "long" },
diff --git a/core/camel-api/src/main/java/org/apache/camel/CamelContext.java
b/core/camel-api/src/main/java/org/apache/camel/CamelContext.java
index 542b104..bedcd7d 100644
--- a/core/camel-api/src/main/java/org/apache/camel/CamelContext.java
+++ b/core/camel-api/src/main/java/org/apache/camel/CamelContext.java
@@ -1207,13 +1207,13 @@ public interface CamelContext extends
CamelContextLifecycle, RuntimeConfiguratio
* Whether camel-k style modeline is also enabled when not using camel-k.
Enabling this allows to use a camel-k like
* experience by being able to configure various settings using modeline
directly in your route source code.
*/
- Boolean isModeLine();
+ Boolean ismodeline();
/**
* Whether camel-k style modeline is also enabled when not using camel-k.
Enabling this allows to use a camel-k like
* experience by being able to configure various settings using modeline
directly in your route source code.
*/
- void setModeLine(Boolean modeLine);
+ void setmodeline(Boolean modeline);
/**
* Whether to enable developer console (requires camel-console on
classpath).
diff --git
a/core/camel-api/src/main/java/org/apache/camel/ExtendedCamelContext.java
b/core/camel-api/src/main/java/org/apache/camel/ExtendedCamelContext.java
index 7f3b526..c7f4ceb 100644
--- a/core/camel-api/src/main/java/org/apache/camel/ExtendedCamelContext.java
+++ b/core/camel-api/src/main/java/org/apache/camel/ExtendedCamelContext.java
@@ -51,9 +51,9 @@ import org.apache.camel.spi.LanguageResolver;
import org.apache.camel.spi.LifecycleStrategy;
import org.apache.camel.spi.LogListener;
import org.apache.camel.spi.ManagementMBeanAssembler;
-import org.apache.camel.spi.ModeLineFactory;
import org.apache.camel.spi.ModelJAXBContextFactory;
import org.apache.camel.spi.ModelToXMLDumper;
+import org.apache.camel.spi.ModelineFactory;
import org.apache.camel.spi.NodeIdFactory;
import org.apache.camel.spi.NormalizedEndpointUri;
import org.apache.camel.spi.PackageScanClassResolver;
@@ -857,13 +857,13 @@ public interface ExtendedCamelContext extends
CamelContext {
void setBasePackageScan(String basePackageScan);
/**
- * Gets the {@link ModeLineFactory}.
+ * Gets the {@link ModelineFactory}.
*/
- ModeLineFactory getModeLineFactory();
+ ModelineFactory getModelineFactory();
/**
- * Sets a custom {@link ModeLineFactory}.
+ * Sets a custom {@link ModelineFactory}.
*/
- void setModeLineFactory(ModeLineFactory modeLineFactory);
+ void setModelineFactory(ModelineFactory modelineFactory);
}
diff --git
a/core/camel-api/src/main/java/org/apache/camel/spi/ModeLineFactory.java
b/core/camel-api/src/main/java/org/apache/camel/spi/ModelineFactory.java
similarity index 93%
rename from
core/camel-api/src/main/java/org/apache/camel/spi/ModeLineFactory.java
rename to core/camel-api/src/main/java/org/apache/camel/spi/ModelineFactory.java
index 9508dc9..35b8bae 100644
--- a/core/camel-api/src/main/java/org/apache/camel/spi/ModeLineFactory.java
+++ b/core/camel-api/src/main/java/org/apache/camel/spi/ModelineFactory.java
@@ -19,7 +19,7 @@ package org.apache.camel.spi;
/**
* Factory for parsing camel-k modeline when running Camel standalone with
DSLs.
*/
-public interface ModeLineFactory {
+public interface ModelineFactory {
/**
* Service factory key.
@@ -32,6 +32,6 @@ public interface ModeLineFactory {
* @param resource the resource with Camel routes such as a yaml, xml or
java source file.
* @throws Exception is thrown if error parsing
*/
- void parseModeLine(Resource resource) throws Exception;
+ void parseModeline(Resource resource) throws Exception;
}
diff --git
a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/AbstractCamelContext.java
b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/AbstractCamelContext.java
index 680f1d4..1e52da4 100644
---
a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/AbstractCamelContext.java
+++
b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/AbstractCamelContext.java
@@ -131,9 +131,9 @@ import org.apache.camel.spi.ManagementNameStrategy;
import org.apache.camel.spi.ManagementStrategy;
import org.apache.camel.spi.ManagementStrategyFactory;
import org.apache.camel.spi.MessageHistoryFactory;
-import org.apache.camel.spi.ModeLineFactory;
import org.apache.camel.spi.ModelJAXBContextFactory;
import org.apache.camel.spi.ModelToXMLDumper;
+import org.apache.camel.spi.ModelineFactory;
import org.apache.camel.spi.NodeIdFactory;
import org.apache.camel.spi.NormalizedEndpointUri;
import org.apache.camel.spi.PackageScanClassResolver;
@@ -257,7 +257,7 @@ public abstract class AbstractCamelContext extends
BaseService
private Boolean traceStandby = Boolean.FALSE;
private String tracePattern;
private String tracingLoggingFormat;
- private Boolean modeLine = Boolean.FALSE;
+ private Boolean modeline = Boolean.FALSE;
private Boolean debug = Boolean.FALSE;
private Boolean messageHistory = Boolean.FALSE;
private Boolean logMask = Boolean.FALSE;
@@ -321,7 +321,7 @@ public abstract class AbstractCamelContext extends
BaseService
private volatile PackageScanClassResolver packageScanClassResolver;
private volatile PackageScanResourceResolver packageScanResourceResolver;
private volatile NodeIdFactory nodeIdFactory;
- private volatile ModeLineFactory modeLineFactory;
+ private volatile ModelineFactory modelineFactory;
private volatile ProcessorFactory processorFactory;
private volatile InternalProcessorFactory internalProcessorFactory;
private volatile InterceptEndpointFactory interceptEndpointFactory;
@@ -4098,20 +4098,20 @@ public abstract class AbstractCamelContext extends
BaseService
}
@Override
- public ModeLineFactory getModeLineFactory() {
- if (modeLineFactory == null) {
+ public ModelineFactory getModelineFactory() {
+ if (modelineFactory == null) {
synchronized (lock) {
- if (modeLineFactory == null) {
- setModeLineFactory(createModeLineFactory());
+ if (modelineFactory == null) {
+ setModelineFactory(createModelineFactory());
}
}
}
- return modeLineFactory;
+ return modelineFactory;
}
@Override
- public void setModeLineFactory(ModeLineFactory modeLineFactory) {
- this.modeLineFactory = doAddService(modeLineFactory);
+ public void setModelineFactory(ModelineFactory modelineFactory) {
+ this.modelineFactory = doAddService(modelineFactory);
}
@Override
@@ -4283,13 +4283,13 @@ public abstract class AbstractCamelContext extends
BaseService
}
@Override
- public Boolean isModeLine() {
- return modeLine != null && modeLine;
+ public Boolean ismodeline() {
+ return modeline != null && modeline;
}
@Override
- public void setModeLine(Boolean modeLine) {
- this.modeLine = modeLine;
+ public void setmodeline(Boolean modeline) {
+ this.modeline = modeline;
}
public Boolean isDevConsole() {
@@ -5187,7 +5187,7 @@ public abstract class AbstractCamelContext extends
BaseService
protected abstract NodeIdFactory createNodeIdFactory();
- protected abstract ModeLineFactory createModeLineFactory();
+ protected abstract ModelineFactory createModelineFactory();
protected abstract FactoryFinderResolver createFactoryFinderResolver();
diff --git
a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultRoutesLoader.java
b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultRoutesLoader.java
index 43693a5..71e9321 100644
---
a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultRoutesLoader.java
+++
b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultRoutesLoader.java
@@ -30,7 +30,7 @@ import org.apache.camel.ExtendedCamelContext;
import org.apache.camel.RoutesBuilder;
import org.apache.camel.StaticService;
import org.apache.camel.spi.FactoryFinder;
-import org.apache.camel.spi.ModeLineFactory;
+import org.apache.camel.spi.ModelineFactory;
import org.apache.camel.spi.Resource;
import org.apache.camel.spi.RoutesBuilderLoader;
import org.apache.camel.spi.RoutesLoader;
@@ -155,11 +155,11 @@ public class DefaultRoutesLoader extends ServiceSupport
implements RoutesLoader,
Set<String> answer = new LinkedHashSet<>();
Collection<RoutesBuilder> builders = findRoutesBuilders(resources);
- if (camelContext.isModeLine()) {
- ModeLineFactory factory =
camelContext.adapt(ExtendedCamelContext.class).getModeLineFactory();
+ if (camelContext.ismodeline()) {
+ ModelineFactory factory =
camelContext.adapt(ExtendedCamelContext.class).getModelineFactory();
// gather resources for modeline
for (Resource resource : resources) {
- factory.parseModeLine(resource);
+ factory.parseModeline(resource);
}
}
diff --git
a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/SimpleCamelContext.java
b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/SimpleCamelContext.java
index a4e8f88..aaa24bb 100644
---
a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/SimpleCamelContext.java
+++
b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/SimpleCamelContext.java
@@ -59,9 +59,9 @@ import org.apache.camel.spi.InternalProcessorFactory;
import org.apache.camel.spi.LanguageResolver;
import org.apache.camel.spi.ManagementNameStrategy;
import org.apache.camel.spi.MessageHistoryFactory;
-import org.apache.camel.spi.ModeLineFactory;
import org.apache.camel.spi.ModelJAXBContextFactory;
import org.apache.camel.spi.ModelToXMLDumper;
+import org.apache.camel.spi.ModelineFactory;
import org.apache.camel.spi.NodeIdFactory;
import org.apache.camel.spi.PackageScanClassResolver;
import org.apache.camel.spi.PackageScanResourceResolver;
@@ -241,18 +241,18 @@ public class SimpleCamelContext extends
AbstractCamelContext {
}
@Override
- protected ModeLineFactory createModeLineFactory() {
- Optional<ModeLineFactory> result = ResolverHelper.resolveService(
+ protected ModelineFactory createModelineFactory() {
+ Optional<ModelineFactory> result = ResolverHelper.resolveService(
getCamelContextReference(),
getBootstrapFactoryFinder(),
- ModeLineFactory.FACTORY,
- ModeLineFactory.class);
+ ModelineFactory.FACTORY,
+ ModelineFactory.class);
if (result.isPresent()) {
return result.get();
} else {
throw new IllegalArgumentException(
- "Cannot find ModeLineFactory on classpath. Add
camel-dsl-modeline to classpath.");
+ "Cannot find ModelineFactory on classpath. Add
camel-dsl-modeline to classpath.");
}
}
diff --git
a/core/camel-core-engine/src/generated/java/org/apache/camel/impl/ExtendedCamelContextConfigurer.java
b/core/camel-core-engine/src/generated/java/org/apache/camel/impl/ExtendedCamelContextConfigurer.java
index bc8070b..5189be9 100644
---
a/core/camel-core-engine/src/generated/java/org/apache/camel/impl/ExtendedCamelContextConfigurer.java
+++
b/core/camel-core-engine/src/generated/java/org/apache/camel/impl/ExtendedCamelContextConfigurer.java
@@ -123,14 +123,12 @@ public class ExtendedCamelContextConfigurer extends
org.apache.camel.support.com
case "MessageHistory": target.setMessageHistory(property(camelContext,
java.lang.Boolean.class, value)); return true;
case "messagehistoryfactory":
case "MessageHistoryFactory":
target.setMessageHistoryFactory(property(camelContext,
org.apache.camel.spi.MessageHistoryFactory.class, value)); return true;
- case "modeline":
- case "ModeLine": target.setModeLine(property(camelContext,
java.lang.Boolean.class, value)); return true;
- case "modelinefactory":
- case "ModeLineFactory":
target.setModeLineFactory(property(camelContext,
org.apache.camel.spi.ModeLineFactory.class, value)); return true;
case "modeljaxbcontextfactory":
case "ModelJAXBContextFactory":
target.setModelJAXBContextFactory(property(camelContext,
org.apache.camel.spi.ModelJAXBContextFactory.class, value)); return true;
case "modeltoxmldumper":
case "ModelToXMLDumper":
target.setModelToXMLDumper(property(camelContext,
org.apache.camel.spi.ModelToXMLDumper.class, value)); return true;
+ case "modelinefactory":
+ case "ModelineFactory":
target.setModelineFactory(property(camelContext,
org.apache.camel.spi.ModelineFactory.class, value)); return true;
case "name":
case "Name": target.setName(property(camelContext,
java.lang.String.class, value)); return true;
case "namestrategy":
@@ -324,14 +322,12 @@ public class ExtendedCamelContextConfigurer extends
org.apache.camel.support.com
case "MessageHistory": return java.lang.Boolean.class;
case "messagehistoryfactory":
case "MessageHistoryFactory": return
org.apache.camel.spi.MessageHistoryFactory.class;
- case "modeline":
- case "ModeLine": return java.lang.Boolean.class;
- case "modelinefactory":
- case "ModeLineFactory": return
org.apache.camel.spi.ModeLineFactory.class;
case "modeljaxbcontextfactory":
case "ModelJAXBContextFactory": return
org.apache.camel.spi.ModelJAXBContextFactory.class;
case "modeltoxmldumper":
case "ModelToXMLDumper": return
org.apache.camel.spi.ModelToXMLDumper.class;
+ case "modelinefactory":
+ case "ModelineFactory": return
org.apache.camel.spi.ModelineFactory.class;
case "name":
case "Name": return java.lang.String.class;
case "namestrategy":
@@ -526,14 +522,12 @@ public class ExtendedCamelContextConfigurer extends
org.apache.camel.support.com
case "MessageHistory": return target.isMessageHistory();
case "messagehistoryfactory":
case "MessageHistoryFactory": return target.getMessageHistoryFactory();
- case "modeline":
- case "ModeLine": return target.isModeLine();
- case "modelinefactory":
- case "ModeLineFactory": return target.getModeLineFactory();
case "modeljaxbcontextfactory":
case "ModelJAXBContextFactory": return
target.getModelJAXBContextFactory();
case "modeltoxmldumper":
case "ModelToXMLDumper": return target.getModelToXMLDumper();
+ case "modelinefactory":
+ case "ModelineFactory": return target.getModelineFactory();
case "name":
case "Name": return target.getName();
case "namestrategy":
diff --git
a/core/camel-core-engine/src/main/java/org/apache/camel/impl/lw/LightweightCamelContext.java
b/core/camel-core-engine/src/main/java/org/apache/camel/impl/lw/LightweightCamelContext.java
index ee3206d..bcccc6a 100644
---
a/core/camel-core-engine/src/main/java/org/apache/camel/impl/lw/LightweightCamelContext.java
+++
b/core/camel-core-engine/src/main/java/org/apache/camel/impl/lw/LightweightCamelContext.java
@@ -114,10 +114,10 @@ import org.apache.camel.spi.ManagementMBeanAssembler;
import org.apache.camel.spi.ManagementNameStrategy;
import org.apache.camel.spi.ManagementStrategy;
import org.apache.camel.spi.MessageHistoryFactory;
-import org.apache.camel.spi.ModeLineFactory;
import org.apache.camel.spi.ModelJAXBContextFactory;
import org.apache.camel.spi.ModelReifierFactory;
import org.apache.camel.spi.ModelToXMLDumper;
+import org.apache.camel.spi.ModelineFactory;
import org.apache.camel.spi.NodeIdFactory;
import org.apache.camel.spi.NormalizedEndpointUri;
import org.apache.camel.spi.PackageScanClassResolver;
@@ -914,13 +914,13 @@ public class LightweightCamelContext implements
ExtendedCamelContext, CatalogCam
}
@Override
- public Boolean isModeLine() {
- return delegate.isModeLine();
+ public Boolean ismodeline() {
+ return delegate.ismodeline();
}
@Override
- public void setModeLine(Boolean modeLine) {
- delegate.setModeLine(modeLine);
+ public void setmodeline(Boolean modeline) {
+ delegate.setmodeline(modeline);
}
@Override
@@ -1447,13 +1447,13 @@ public class LightweightCamelContext implements
ExtendedCamelContext, CatalogCam
}
@Override
- public ModeLineFactory getModeLineFactory() {
- return getExtendedCamelContext().getModeLineFactory();
+ public ModelineFactory getModelineFactory() {
+ return getExtendedCamelContext().getModelineFactory();
}
@Override
- public void setModeLineFactory(ModeLineFactory modeLineFactory) {
- getExtendedCamelContext().setModeLineFactory(modeLineFactory);
+ public void setModelineFactory(ModelineFactory modelineFactory) {
+ getExtendedCamelContext().setModelineFactory(modelineFactory);
}
@Override
diff --git
a/core/camel-core-engine/src/main/java/org/apache/camel/impl/lw/LightweightRuntimeCamelContext.java
b/core/camel-core-engine/src/main/java/org/apache/camel/impl/lw/LightweightRuntimeCamelContext.java
index e61f092..0e3c9ad 100644
---
a/core/camel-core-engine/src/main/java/org/apache/camel/impl/lw/LightweightRuntimeCamelContext.java
+++
b/core/camel-core-engine/src/main/java/org/apache/camel/impl/lw/LightweightRuntimeCamelContext.java
@@ -109,9 +109,9 @@ import org.apache.camel.spi.ManagementMBeanAssembler;
import org.apache.camel.spi.ManagementNameStrategy;
import org.apache.camel.spi.ManagementStrategy;
import org.apache.camel.spi.MessageHistoryFactory;
-import org.apache.camel.spi.ModeLineFactory;
import org.apache.camel.spi.ModelJAXBContextFactory;
import org.apache.camel.spi.ModelToXMLDumper;
+import org.apache.camel.spi.ModelineFactory;
import org.apache.camel.spi.NodeIdFactory;
import org.apache.camel.spi.NormalizedEndpointUri;
import org.apache.camel.spi.PackageScanClassResolver;
@@ -183,7 +183,7 @@ public class LightweightRuntimeCamelContext implements
ExtendedCamelContext, Cat
private final ExchangeFactory exchangeFactory;
private final ExchangeFactoryManager exchangeFactoryManager;
private final ProcessorExchangeFactory processorExchangeFactory;
- private final ModeLineFactory modeLineFactory;
+ private final ModelineFactory modelineFactory;
private final ReactiveExecutor reactiveExecutor;
private final AsyncProcessorAwaitManager asyncProcessorAwaitManager;
private final ExecutorServiceManager executorServiceManager;
@@ -237,7 +237,7 @@ public class LightweightRuntimeCamelContext implements
ExtendedCamelContext, Cat
headersMapFactory =
context.adapt(ExtendedCamelContext.class).getHeadersMapFactory();
exchangeFactory =
context.adapt(ExtendedCamelContext.class).getExchangeFactory();
exchangeFactoryManager =
context.adapt(ExtendedCamelContext.class).getExchangeFactoryManager();
- modeLineFactory =
context.adapt(ExtendedCamelContext.class).getModeLineFactory();
+ modelineFactory =
context.adapt(ExtendedCamelContext.class).getModelineFactory();
processorExchangeFactory =
context.adapt(ExtendedCamelContext.class).getProcessorExchangeFactory();
reactiveExecutor =
context.adapt(ExtendedCamelContext.class).getReactiveExecutor();
asyncProcessorAwaitManager =
context.adapt(ExtendedCamelContext.class).getAsyncProcessorAwaitManager();
@@ -1232,12 +1232,12 @@ public class LightweightRuntimeCamelContext implements
ExtendedCamelContext, Cat
}
@Override
- public Boolean isModeLine() {
+ public Boolean ismodeline() {
throw new UnsupportedOperationException();
}
@Override
- public void setModeLine(Boolean modeLine) {
+ public void setmodeline(Boolean modeline) {
throw new UnsupportedOperationException();
}
@@ -1579,12 +1579,12 @@ public class LightweightRuntimeCamelContext implements
ExtendedCamelContext, Cat
}
@Override
- public ModeLineFactory getModeLineFactory() {
- return modeLineFactory;
+ public ModelineFactory getModelineFactory() {
+ return modelineFactory;
}
@Override
- public void setModeLineFactory(ModeLineFactory modeLineFactory) {
+ public void setModelineFactory(ModelineFactory modelineFactory) {
throw new UnsupportedOperationException();
}
diff --git
a/core/camel-main/src/generated/java/org/apache/camel/main/MainConfigurationPropertiesConfigurer.java
b/core/camel-main/src/generated/java/org/apache/camel/main/MainConfigurationPropertiesConfigurer.java
index 0dab493..000c931 100644
---
a/core/camel-main/src/generated/java/org/apache/camel/main/MainConfigurationPropertiesConfigurer.java
+++
b/core/camel-main/src/generated/java/org/apache/camel/main/MainConfigurationPropertiesConfigurer.java
@@ -119,8 +119,6 @@ public class MainConfigurationPropertiesConfigurer extends
org.apache.camel.supp
case "MdcLoggingKeysPattern":
target.setMdcLoggingKeysPattern(property(camelContext, java.lang.String.class,
value)); return true;
case "messagehistory":
case "MessageHistory": target.setMessageHistory(property(camelContext,
boolean.class, value)); return true;
- case "modeline":
- case "ModeLine": target.setModeLine(property(camelContext,
boolean.class, value)); return true;
case "name":
case "Name": target.setName(property(camelContext,
java.lang.String.class, value)); return true;
case "producertemplatecachesize":
@@ -344,8 +342,6 @@ public class MainConfigurationPropertiesConfigurer extends
org.apache.camel.supp
case "MdcLoggingKeysPattern": return java.lang.String.class;
case "messagehistory":
case "MessageHistory": return boolean.class;
- case "modeline":
- case "ModeLine": return boolean.class;
case "name":
case "Name": return java.lang.String.class;
case "producertemplatecachesize":
@@ -570,8 +566,6 @@ public class MainConfigurationPropertiesConfigurer extends
org.apache.camel.supp
case "MdcLoggingKeysPattern": return target.getMdcLoggingKeysPattern();
case "messagehistory":
case "MessageHistory": return target.isMessageHistory();
- case "modeline":
- case "ModeLine": return target.isModeLine();
case "name":
case "Name": return target.getName();
case "producertemplatecachesize":
diff --git
a/core/camel-main/src/generated/resources/META-INF/camel-main-configuration-metadata.json
b/core/camel-main/src/generated/resources/META-INF/camel-main-configuration-metadata.json
index 8c0377f..e5dc1a5 100644
---
a/core/camel-main/src/generated/resources/META-INF/camel-main-configuration-metadata.json
+++
b/core/camel-main/src/generated/resources/META-INF/camel-main-configuration-metadata.json
@@ -59,7 +59,6 @@
{ "name": "camel.main.logMask", "description": "Sets whether log mask is
enabled or not. Default is false.", "sourceType":
"org.apache.camel.main.DefaultConfigurationProperties", "type": "boolean",
"javaType": "boolean", "defaultValue": "false" },
{ "name": "camel.main.mdcLoggingKeysPattern", "description": "Sets the
pattern used for determine which custom MDC keys to propagate during message
routing when the routing engine continues routing asynchronously for the given
message. Setting this pattern to will propagate all custom keys. Or setting the
pattern to foo,bar will propagate any keys starting with either foo or bar.
Notice that a set of standard Camel MDC keys are always propagated which starts
with camel. as key name. [...]
{ "name": "camel.main.messageHistory", "description": "Sets whether
message history is enabled or not. Default is false.", "sourceType":
"org.apache.camel.main.DefaultConfigurationProperties", "type": "boolean",
"javaType": "boolean", "defaultValue": "false" },
- { "name": "camel.main.modeLine", "description": "Whether camel-k style
modeline is also enabled when not using camel-k. Enabling this allows to use a
camel-k like experience by being able to configure various settings using
modeline directly in your route source code.", "sourceType":
"org.apache.camel.main.DefaultConfigurationProperties", "type": "boolean",
"javaType": "boolean", "defaultValue": "false" },
{ "name": "camel.main.name", "description": "Sets the name of the
CamelContext.", "sourceType":
"org.apache.camel.main.DefaultConfigurationProperties", "type": "string",
"javaType": "java.lang.String" },
{ "name": "camel.main.producerTemplateCacheSize", "description": "Producer
template endpoints cache size.", "sourceType":
"org.apache.camel.main.DefaultConfigurationProperties", "type": "integer",
"javaType": "int", "defaultValue": 1000 },
{ "name": "camel.main.routeControllerBackOffDelay", "description":
"Backoff delay in millis when restarting a route that failed to startup.",
"sourceType": "org.apache.camel.main.DefaultConfigurationProperties", "type":
"integer", "javaType": "long" },
diff --git a/core/camel-main/src/main/docs/main.adoc
b/core/camel-main/src/main/docs/main.adoc
index 47681eb..4362f86 100644
--- a/core/camel-main/src/main/docs/main.adoc
+++ b/core/camel-main/src/main/docs/main.adoc
@@ -18,7 +18,7 @@ The following tables lists all the options:
// main options: START
=== Camel Main configurations
-The camel.main supports 109 options, which are listed below.
+The camel.main supports 108 options, which are listed below.
[width="100%",cols="2,5,^1,2",options="header"]
|===
@@ -72,7 +72,6 @@ The camel.main supports 109 options, which are listed below.
| *camel.main.logMask* | Sets whether log mask is enabled or not. Default is
false. | false | boolean
| *camel.main.mdcLoggingKeys{zwsp}Pattern* | Sets the pattern used for
determine which custom MDC keys to propagate during message routing when the
routing engine continues routing asynchronously for the given message. Setting
this pattern to will propagate all custom keys. Or setting the pattern to
foo,bar will propagate any keys starting with either foo or bar. Notice that a
set of standard Camel MDC keys are always propagated which starts with camel.
as key name. The match rules are a [...]
| *camel.main.messageHistory* | Sets whether message history is enabled or
not. Default is false. | false | boolean
-| *camel.main.modeLine* | Whether camel-k style modeline is also enabled when
not using camel-k. Enabling this allows to use a camel-k like experience by
being able to configure various settings using modeline directly in your route
source code. | false | boolean
| *camel.main.name* | Sets the name of the CamelContext. | | String
| *camel.main.producerTemplate{zwsp}CacheSize* | Producer template endpoints
cache size. | 1000 | int
| *camel.main.routeControllerBack{zwsp}OffDelay* | Backoff delay in millis
when restarting a route that failed to startup. | | long
diff --git
a/core/camel-main/src/main/java/org/apache/camel/main/BaseMainSupport.java
b/core/camel-main/src/main/java/org/apache/camel/main/BaseMainSupport.java
index ffc1a46..7755478 100644
--- a/core/camel-main/src/main/java/org/apache/camel/main/BaseMainSupport.java
+++ b/core/camel-main/src/main/java/org/apache/camel/main/BaseMainSupport.java
@@ -532,7 +532,7 @@ public abstract class BaseMainSupport extends BaseService {
protected void configureRoutes(CamelContext camelContext) throws Exception
{
// then configure and add the routes
RoutesConfigurer configurer = new RoutesConfigurer();
- configurer.setModeLine(camelContext.isModeLine());
+ configurer.setmodeline(camelContext.ismodeline());
if (mainConfigurationProperties.isRoutesCollectorEnabled()) {
configurer.setRoutesCollector(routesCollector);
diff --git
a/core/camel-main/src/main/java/org/apache/camel/main/DefaultConfigurationConfigurer.java
b/core/camel-main/src/main/java/org/apache/camel/main/DefaultConfigurationConfigurer.java
index 77ad361..ccea368 100644
---
a/core/camel-main/src/main/java/org/apache/camel/main/DefaultConfigurationConfigurer.java
+++
b/core/camel-main/src/main/java/org/apache/camel/main/DefaultConfigurationConfigurer.java
@@ -229,7 +229,7 @@ public final class DefaultConfigurationConfigurer {
camelContext.setLoadTypeConverters(config.isLoadTypeConverters());
camelContext.setLoadHealthChecks(config.isLoadHealthChecks());
camelContext.setDevConsole(config.isDevConsoleEnabled());
- camelContext.setModeLine(config.isModeLine());
+ camelContext.setmodeline(config.ismodeline());
if (config.isRoutesReloadEnabled()) {
RouteWatcherReloadStrategy reloader = new
RouteWatcherReloadStrategy(
config.getRoutesReloadDirectory(),
config.isRoutesReloadDirectoryRecursive());
diff --git
a/core/camel-main/src/main/java/org/apache/camel/main/DefaultConfigurationProperties.java
b/core/camel-main/src/main/java/org/apache/camel/main/DefaultConfigurationProperties.java
index 15bf3c5..1ab0977 100644
---
a/core/camel-main/src/main/java/org/apache/camel/main/DefaultConfigurationProperties.java
+++
b/core/camel-main/src/main/java/org/apache/camel/main/DefaultConfigurationProperties.java
@@ -54,7 +54,7 @@ public abstract class DefaultConfigurationProperties<T> {
private boolean loadTypeConverters;
private boolean loadHealthChecks;
private boolean devConsoleEnabled;
- private boolean modeLine;
+ private boolean modeline;
private int logDebugMaxChars;
private boolean streamCachingEnabled;
private String streamCachingSpoolDirectory;
@@ -394,16 +394,16 @@ public abstract class DefaultConfigurationProperties<T> {
this.devConsoleEnabled = devConsoleEnabled;
}
- public boolean isModeLine() {
- return modeLine;
+ public boolean ismodeline() {
+ return modeline;
}
/**
* Whether camel-k style modeline is also enabled when not using camel-k.
Enabling this allows to use a camel-k like
* experience by being able to configure various settings using modeline
directly in your route source code.
*/
- public void setModeLine(boolean modeLine) {
- this.modeLine = modeLine;
+ public void setmodeline(boolean modeline) {
+ this.modeline = modeline;
}
public int getLogDebugMaxChars() {
@@ -1646,8 +1646,8 @@ public abstract class DefaultConfigurationProperties<T> {
* Whether camel-k style modeline is also enabled when not using camel-k.
Enabling this allows to use a camel-k like
* experience by being able to configure various settings using modeline
directly in your route source code.
*/
- public T withModeLine(boolean modeLine) {
- this.modeLine = modeLine;
+ public T withModeline(boolean modeline) {
+ this.modeline = modeline;
return (T) this;
}
diff --git
a/core/camel-main/src/main/java/org/apache/camel/main/RoutesConfigurer.java
b/core/camel-main/src/main/java/org/apache/camel/main/RoutesConfigurer.java
index 0666600..aad2a68 100644
--- a/core/camel-main/src/main/java/org/apache/camel/main/RoutesConfigurer.java
+++ b/core/camel-main/src/main/java/org/apache/camel/main/RoutesConfigurer.java
@@ -28,7 +28,7 @@ import org.apache.camel.RoutesBuilder;
import org.apache.camel.RuntimeCamelException;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.spi.CamelBeanPostProcessor;
-import org.apache.camel.spi.ModeLineFactory;
+import org.apache.camel.spi.ModelineFactory;
import org.apache.camel.spi.Resource;
import org.apache.camel.support.OrderedComparator;
import org.apache.camel.util.StopWatch;
@@ -46,7 +46,7 @@ public class RoutesConfigurer {
private CamelBeanPostProcessor beanPostProcessor;
private List<RoutesBuilder> routesBuilders;
private String basePackageScan;
- private boolean modeLine;
+ private boolean modeline;
private String routesBuilderClasses;
private String javaRoutesExcludePattern;
private String javaRoutesIncludePattern;
@@ -69,12 +69,12 @@ public class RoutesConfigurer {
this.basePackageScan = basePackageScan;
}
- public boolean isModeLine() {
- return modeLine;
+ public boolean ismodeline() {
+ return modeline;
}
- public void setModeLine(boolean modeLine) {
- this.modeLine = modeLine;
+ public void setmodeline(boolean modeline) {
+ this.modeline = modeline;
}
public String getRoutesBuilderClasses() {
@@ -232,9 +232,9 @@ public class RoutesConfigurer {
// sort routes according to ordered
routes.sort(OrderedComparator.get());
- if (modeLine) {
+ if (modeline) {
ExtendedCamelContext ecc =
camelContext.adapt(ExtendedCamelContext.class);
- ModeLineFactory factory = ecc.getModeLineFactory();
+ ModelineFactory factory = ecc.getModelineFactory();
List<Resource> resources = new ArrayList<>();
// gather resources for modeline
for (RoutesBuilder builder : routes) {
@@ -244,7 +244,7 @@ public class RoutesConfigurer {
}
for (Resource resource : resources) {
LOG.debug("Parsing modeline: {}", resource);
- factory.parseModeLine(resource);
+ factory.parseModeline(resource);
}
}
diff --git a/docs/components/modules/others/nav.adoc
b/docs/components/modules/others/nav.adoc
index bdda174e..5e27fb6 100644
--- a/docs/components/modules/others/nav.adoc
+++ b/docs/components/modules/others/nav.adoc
@@ -13,7 +13,7 @@
** xref:cxf-transport.adoc[CXF Transport]
** xref:debug.adoc[Debug]
** xref:dsl.adoc[DSL]
-*** xref:dsl-modeline.adoc[DSL Modeline]
+*** xref:dsl-modeline.adoc[DSL modeline]
*** xref:groovy-dsl.adoc[Groovy Dsl]
*** xref:java-joor-dsl.adoc[Java DSL (runtime compiled)]
*** xref:js-dsl.adoc[JavaScript DSL]
diff --git
a/dsl/camel-dsl-modeline/src/generated/resources/META-INF/services/org/apache/camel/dsl-modeline-factory
b/dsl/camel-dsl-modeline/src/generated/resources/META-INF/services/org/apache/camel/dsl-modeline-factory
index 081e544..81ee00a 100644
---
a/dsl/camel-dsl-modeline/src/generated/resources/META-INF/services/org/apache/camel/dsl-modeline-factory
+++
b/dsl/camel-dsl-modeline/src/generated/resources/META-INF/services/org/apache/camel/dsl-modeline-factory
@@ -1,2 +1,2 @@
# Generated by camel build tools - do NOT edit this file!
-class=org.apache.camel.dsl.modeline.DefaultModeLineFactory
+class=org.apache.camel.dsl.modeline.DefaultModelineFactory
diff --git a/dsl/camel-dsl-modeline/src/main/docs/dsl-modeline.adoc
b/dsl/camel-dsl-modeline/src/main/docs/dsl-modeline.adoc
index 840d0b5..a48c863 100644
--- a/dsl/camel-dsl-modeline/src/main/docs/dsl-modeline.adoc
+++ b/dsl/camel-dsl-modeline/src/main/docs/dsl-modeline.adoc
@@ -1,5 +1,5 @@
-= DSL Modeline Component
-:doctitle: DSL Modeline
+= DSL modeline Component
+:doctitle: DSL modeline
:shortname: dsl-modeline
:artifactid: camel-dsl-modeline
:description: Camel DSL Camel K modeline
diff --git
a/dsl/camel-dsl-modeline/src/main/java/org/apache/camel/dsl/modeline/DefaultModeLineFactory.java
b/dsl/camel-dsl-modeline/src/main/java/org/apache/camel/dsl/modeline/DefaultModelineFactory.java
similarity index 90%
rename from
dsl/camel-dsl-modeline/src/main/java/org/apache/camel/dsl/modeline/DefaultModeLineFactory.java
rename to
dsl/camel-dsl-modeline/src/main/java/org/apache/camel/dsl/modeline/DefaultModelineFactory.java
index dc12bd3..2d7d8f7 100644
---
a/dsl/camel-dsl-modeline/src/main/java/org/apache/camel/dsl/modeline/DefaultModeLineFactory.java
+++
b/dsl/camel-dsl-modeline/src/main/java/org/apache/camel/dsl/modeline/DefaultModelineFactory.java
@@ -23,16 +23,16 @@ import org.apache.camel.CamelContextAware;
import org.apache.camel.NonManagedService;
import org.apache.camel.StaticService;
import org.apache.camel.spi.CamelContextCustomizer;
-import org.apache.camel.spi.ModeLineFactory;
+import org.apache.camel.spi.ModelineFactory;
import org.apache.camel.spi.PropertiesComponent;
import org.apache.camel.spi.PropertiesSource;
import org.apache.camel.spi.Resource;
import org.apache.camel.spi.annotations.JdkService;
import org.apache.camel.support.service.ServiceSupport;
-@JdkService(ModeLineFactory.FACTORY)
-public class DefaultModeLineFactory extends ServiceSupport
- implements ModeLineFactory, CamelContextAware, NonManagedService,
StaticService {
+@JdkService(ModelineFactory.FACTORY)
+public class DefaultModelineFactory extends ServiceSupport
+ implements ModelineFactory, CamelContextAware, NonManagedService,
StaticService {
private CamelContext camelContext;
private ModelineParser parser;
@@ -48,7 +48,7 @@ public class DefaultModeLineFactory extends ServiceSupport
}
@Override
- public void parseModeLine(Resource resource) throws Exception {
+ public void parseModeline(Resource resource) throws Exception {
List<CamelContextCustomizer> customizers = parser.parse(resource);
customizers.forEach(c -> c.configure(camelContext));
}
diff --git
a/dsl/camel-dsl-modeline/src/main/java/org/apache/camel/dsl/modeline/Trait.java
b/dsl/camel-dsl-modeline/src/main/java/org/apache/camel/dsl/modeline/Trait.java
index 94c6202..77f893c 100644
---
a/dsl/camel-dsl-modeline/src/main/java/org/apache/camel/dsl/modeline/Trait.java
+++
b/dsl/camel-dsl-modeline/src/main/java/org/apache/camel/dsl/modeline/Trait.java
@@ -19,7 +19,7 @@ package org.apache.camel.dsl.modeline;
import org.apache.camel.spi.CamelContextCustomizer;
/**
- * Modeline trait
+ * modeline trait
*/
public interface Trait {
diff --git
a/dsl/camel-dsl-modeline/src/test/java/org/apache/camel/dsl/modeline/ModelineParserTest.java
b/dsl/camel-dsl-modeline/src/test/java/org/apache/camel/dsl/modeline/ModelineParserTest.java
index fd82322..d435a67 100644
---
a/dsl/camel-dsl-modeline/src/test/java/org/apache/camel/dsl/modeline/ModelineParserTest.java
+++
b/dsl/camel-dsl-modeline/src/test/java/org/apache/camel/dsl/modeline/ModelineParserTest.java
@@ -18,16 +18,12 @@ package org.apache.camel.dsl.modeline;
import java.util.ArrayList;
import java.util.List;
-import java.util.Optional;
import org.apache.camel.CamelContext;
-import org.apache.camel.CamelContextAware;
import org.apache.camel.ExtendedCamelContext;
import org.apache.camel.spi.DependencyStrategy;
-import org.apache.camel.spi.ModeLineFactory;
-import org.apache.camel.support.ResolverHelper;
+import org.apache.camel.spi.ModelineFactory;
import org.apache.camel.support.ResourceHelper;
-import org.apache.camel.support.service.ServiceHelper;
import org.apache.camel.test.junit5.CamelTestSupport;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
@@ -36,23 +32,8 @@ public class ModelineParserTest extends CamelTestSupport {
private final List<String> deps = new ArrayList<>();
- private ModeLineFactory resolveModelineFactory(CamelContext camelContext) {
- final ExtendedCamelContext ecc =
camelContext.adapt(ExtendedCamelContext.class);
-
- Optional<ModeLineFactory> result = ResolverHelper.resolveService(
- ecc,
- ecc.getBootstrapFactoryFinder(),
- ModeLineFactory.FACTORY,
- ModeLineFactory.class);
-
- if (result.isPresent()) {
- ModeLineFactory mf = result.get();
- CamelContextAware.trySetCamelContext(mf, camelContext);
- ServiceHelper.startService(mf);
- return mf;
- } else {
- throw new IllegalArgumentException("Cannot find ModeLineFactory");
- }
+ private ModelineFactory resolveModelineFactory(CamelContext camelContext) {
+ return
camelContext.adapt(ExtendedCamelContext.class).getModelineFactory();
}
@Override
@@ -79,8 +60,8 @@ public class ModelineParserTest extends CamelTestSupport {
Assertions.assertEquals(0, deps.size());
String line = "// camel-k: dependency=mvn:org.my:application:1.0";
- ModeLineFactory factory = resolveModelineFactory(context);
- factory.parseModeLine(ResourceHelper.fromString(null, line));
+ ModelineFactory factory = resolveModelineFactory(context);
+ factory.parseModeline(ResourceHelper.fromString(null, line));
Assertions.assertEquals(1, deps.size());
Assertions.assertEquals("mvn:org.my:application:1.0", deps.get(0));
@@ -93,8 +74,8 @@ public class ModelineParserTest extends CamelTestSupport {
Assertions.assertEquals(0, deps.size());
String line = "### camel-k: dependency=mvn:org.my:application:1.0";
- ModeLineFactory factory = resolveModelineFactory(context);
- factory.parseModeLine(ResourceHelper.fromString(null, line));
+ ModelineFactory factory = resolveModelineFactory(context);
+ factory.parseModeline(ResourceHelper.fromString(null, line));
Assertions.assertEquals(1, deps.size());
Assertions.assertEquals("mvn:org.my:application:1.0", deps.get(0));
@@ -108,8 +89,8 @@ public class ModelineParserTest extends CamelTestSupport {
Assertions.assertEquals(0, deps.size());
String line = "// camel-k: dependency=mvn:org.my:application:1.0
dependency=mvn:com.foo:myapp:2.1";
- ModeLineFactory factory = resolveModelineFactory(context);
- factory.parseModeLine(ResourceHelper.fromString(null, line));
+ ModelineFactory factory = resolveModelineFactory(context);
+ factory.parseModeline(ResourceHelper.fromString(null, line));
Assertions.assertEquals(2, deps.size());
Assertions.assertEquals("mvn:org.my:application:1.0", deps.get(0));
@@ -121,8 +102,8 @@ public class ModelineParserTest extends CamelTestSupport {
context.start();
String line = "// camel-k: property=hi=Hello";
- ModeLineFactory factory = resolveModelineFactory(context);
- factory.parseModeLine(ResourceHelper.fromString(null, line));
+ ModelineFactory factory = resolveModelineFactory(context);
+ factory.parseModeline(ResourceHelper.fromString(null, line));
Assertions.assertEquals("Hello",
context.getPropertiesComponent().parseUri("{{hi}}"));
}
@@ -132,8 +113,8 @@ public class ModelineParserTest extends CamelTestSupport {
context.start();
String line = "// camel-k: property=hi=Hello property=bye=Farvel";
- ModeLineFactory factory = resolveModelineFactory(context);
- factory.parseModeLine(ResourceHelper.fromString(null, line));
+ ModelineFactory factory = resolveModelineFactory(context);
+ factory.parseModeline(ResourceHelper.fromString(null, line));
Assertions.assertEquals("Hello",
context.getPropertiesComponent().parseUri("{{hi}}"));
Assertions.assertEquals("Farvel",
context.getPropertiesComponent().parseUri("{{bye}}"));
@@ -144,8 +125,8 @@ public class ModelineParserTest extends CamelTestSupport {
context.start();
String line = "// camel-k: property=hi='Hello World'
property=bye='Farvel Verden'";
- ModeLineFactory factory = resolveModelineFactory(context);
- factory.parseModeLine(ResourceHelper.fromString(null, line));
+ ModelineFactory factory = resolveModelineFactory(context);
+ factory.parseModeline(ResourceHelper.fromString(null, line));
Assertions.assertEquals("Hello World",
context.getPropertiesComponent().parseUri("{{hi}}"));
Assertions.assertEquals("Farvel Verden",
context.getPropertiesComponent().parseUri("{{bye}}"));
@@ -159,8 +140,8 @@ public class ModelineParserTest extends CamelTestSupport {
Assertions.assertEquals(0, deps.size());
String line = "// camel-k: dependency=mvn:org.my:application:1.0
property=hi=Hello dependency=mvn:com.foo:myapp:2.1";
- ModeLineFactory factory = resolveModelineFactory(context);
- factory.parseModeLine(ResourceHelper.fromString(null, line));
+ ModelineFactory factory = resolveModelineFactory(context);
+ factory.parseModeline(ResourceHelper.fromString(null, line));
Assertions.assertEquals(2, deps.size());
Assertions.assertEquals("mvn:org.my:application:1.0", deps.get(0));
@@ -178,8 +159,8 @@ public class ModelineParserTest extends CamelTestSupport {
String line
= "// camel-k: dependency=mvn:org.my:application:1.0
property=hi=Hello dependency=mvn:com.foo:myapp:2.1";
- ModeLineFactory factory = resolveModelineFactory(context);
- factory.parseModeLine(ResourceHelper.fromString(null, line));
+ ModelineFactory factory = resolveModelineFactory(context);
+ factory.parseModeline(ResourceHelper.fromString(null, line));
Assertions.assertEquals(2, deps.size());
Assertions.assertEquals("mvn:org.my:application:1.0", deps.get(0));
@@ -193,8 +174,8 @@ public class ModelineParserTest extends CamelTestSupport {
context.start();
String line = "// camel-k: property=classpath:myapp.properties";
- ModeLineFactory factory = resolveModelineFactory(context);
- factory.parseModeLine(ResourceHelper.fromString(null, line));
+ ModelineFactory factory = resolveModelineFactory(context);
+ factory.parseModeline(ResourceHelper.fromString(null, line));
Assertions.assertEquals("Hej",
context.getPropertiesComponent().parseUri("{{hi}}"));
Assertions.assertEquals("bar",
context.getPropertiesComponent().parseUri("{{foo}}"));
diff --git
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Run.java
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Run.java
index 8beaa8f..6653527 100644
---
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Run.java
+++
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Run.java
@@ -158,7 +158,7 @@ class Run implements Callable<Integer> {
main.addInitialProperty("camel.main.routesReloadEnabled", reload ?
"true" : "false");
main.addInitialProperty("camel.main.sourceLocationEnabled", "true");
main.addInitialProperty("camel.main.tracing", trace ? "true" :
"false");
- main.addInitialProperty("camel.main.modeLine", modeline ? "true" :
"false");
+ main.addInitialProperty("camel.main.modeline", modeline ? "true" :
"false");
if (maxMessages > 0) {
main.addInitialProperty("camel.main.durationMaxMessages",
String.valueOf(maxMessages));
diff --git a/dsl/camel-jbang/camel-jbang-main/README.md
b/dsl/camel-jbang/camel-jbang-main/README.md
index 6680749..a334e4f 100644
--- a/dsl/camel-jbang/camel-jbang-main/README.md
+++ b/dsl/camel-jbang/camel-jbang-main/README.md
@@ -98,7 +98,7 @@ Starting CamelJBang
2022-02-15 16:49:07.273 INFO 31844 --- [ main]
org.apache.camel.main.BaseMainSupport :
camel.main.routesReloadEnabled=false
2022-02-15 16:49:07.273 INFO 31844 --- [ main]
org.apache.camel.main.BaseMainSupport :
camel.main.sourceLocationEnabled=true
2022-02-15 16:49:07.273 INFO 31844 --- [ main]
org.apache.camel.main.BaseMainSupport : camel.main.tracing=false
-2022-02-15 16:49:07.274 INFO 31844 --- [ main]
org.apache.camel.main.BaseMainSupport : camel.main.modeLine=true
+2022-02-15 16:49:07.274 INFO 31844 --- [ main]
org.apache.camel.main.BaseMainSupport : camel.main.modeline=true
2022-02-15 16:49:07.274 INFO 31844 --- [ main]
org.apache.camel.main.BaseMainSupport :
camel.main.routesIncludePattern=file:../examples/aws-secrets-manager-properties.yaml
2022-02-15 16:49:07.274 INFO 31844 --- [ main]
org.apache.camel.main.BaseMainSupport :
camel.component.kamelet.location=classpath:/kamelets,github:apache:camel-kamelets/kamelets
2022-02-15 16:49:08.359 INFO 31844 --- [ main]
org.apache.camel.main.DownloaderHelper : Downloaded dependency:
org.apache.camel:camel-aws-secrets-manager:3.16.0-SNAPSHOT took: 1s14ms
diff --git
a/dsl/camel-kamelet-main/src/test/java/org/apache/camel/main/ModelineTest.java
b/dsl/camel-kamelet-main/src/test/java/org/apache/camel/main/ModelineTest.java
index 84ee1a7..058fad0 100644
---
a/dsl/camel-kamelet-main/src/test/java/org/apache/camel/main/ModelineTest.java
+++
b/dsl/camel-kamelet-main/src/test/java/org/apache/camel/main/ModelineTest.java
@@ -25,7 +25,7 @@ public class ModelineTest {
@Test
public void testModeline() throws Exception {
Main main = new Main();
- main.configure().withModeLine(true);
+ main.configure().withModeline(true);
main.configure().withRoutesIncludePattern("file:src/test/resources/my-modeline.yaml");
main.run();
