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 05b08f924550 CAMEL-21356 - Javadoc compliance with doclint for Java 17
in camel-base and camel-core-languages (#29718)
05b08f924550 is described below
commit 05b08f9245501532c983ebc247ed0cf8d49a8a44
Author: Loris Boiteux <[email protected]>
AuthorDate: Thu Nov 12 19:08:48 2026 +0100
CAMEL-21356 - Javadoc compliance with doclint for Java 17 in camel-base and
camel-core-languages (#29718)
Co-authored-by: Claude Opus 5.5 <[email protected]>
---
.../camel/catalog/docs/properties-component.adoc | 2 +-
.../src/main/docs/properties-component.adoc | 2 +-
.../AbstractLocationPropertiesSource.java | 2 +-
.../component/properties/PropertiesComponent.java | 18 ++++++++--------
.../properties/PropertiesFunctionResolver.java | 2 +-
.../component/properties/PropertiesLookup.java | 2 +-
.../component/properties/PropertiesParser.java | 4 ++--
.../properties/ServiceHostPropertiesFunction.java | 14 ++++++-------
.../properties/ServicePortPropertiesFunction.java | 14 ++++++-------
.../properties/ServicePropertiesFunction.java | 12 +++++------
.../converter/AnnotationTypeConverterLoader.java | 10 ++++-----
.../camel/impl/converter/DefaultTypeConverter.java | 2 +-
.../TypeConvertersPackageScanClassResolver.java | 2 +-
.../camel/impl/event/ExchangeCreatedEvent.java | 6 +++---
.../camel/impl/event/ExchangeSendingEvent.java | 12 +++++------
.../apache/camel/impl/event/ExchangeSentEvent.java | 6 +++---
.../camel/language/simple/BaseSimpleParser.java | 24 +++++++++++-----------
.../language/simple/SimpleExpressionParser.java | 2 +-
.../language/simple/SimpleInitBlockTokenizer.java | 2 +-
.../language/simple/SimplePredicateParser.java | 20 +++++++++---------
.../camel/language/simple/SimpleSyntaxHints.java | 4 ++--
.../camel/language/simple/SimpleTokenizer.java | 6 +++---
.../language/simple/StringExpressionBuilder.java | 6 +++---
.../apache/camel/language/simple/ast/Block.java | 6 +++---
.../camel/language/simple/ast/LiteralNode.java | 10 ++++-----
.../simple/ast/SimpleFunctionExpression.java | 2 +-
.../simple/functions/MiscFunctionFactory.java | 2 --
.../language/simple/types/BinaryOperatorType.java | 2 +-
.../simple/types/SimpleIllegalSyntaxException.java | 4 ++--
.../language/simple/types/UnaryOperatorType.java | 4 ++--
.../camel/language/tokenizer/TokenizeLanguage.java | 9 ++++----
31 files changed, 106 insertions(+), 107 deletions(-)
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/properties-component.adoc
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/properties-component.adoc
index 2f22143d1bdc..e513c71cb081 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/properties-component.adoc
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/properties-component.adoc
@@ -127,7 +127,7 @@ The component supports the following options, which are
listed below.
| `camel.component.properties.auto-discover-properties-sources` | Whether to
automatically discovery instances of PropertiesSource from registry and service
factory. | true | Boolean
| `camel.component.properties.default-fallback-enabled` | If false, the
component does not attempt to find a default for the key by looking after the
colon separator. | true | Boolean
| `camel.component.properties.encoding` | Encoding to use when loading
properties file from the file system or classpath.
-If no encoding has been set, then the properties files is loaded using
ISO-8859-1 encoding (latin-1) as documented by
java.util.Properties#load(java.io.InputStream) | | String
+If no encoding has been set, then the properties files are loaded using
ISO-8859-1 encoding (latin-1) as documented by
java.util.Properties#load(java.io.InputStream) | | String
| `camel.component.properties.environment-variable-mode` | Sets the OS
environment variables mode (0 = never, 1 = fallback, 2 = override).
The default mode (override) is to use OS environment variables if present, and
override any existing properties.
OS environment variable mode is checked before JVM system property mode | 2 |
Integer
diff --git a/core/camel-base/src/main/docs/properties-component.adoc
b/core/camel-base/src/main/docs/properties-component.adoc
index 2f22143d1bdc..e513c71cb081 100644
--- a/core/camel-base/src/main/docs/properties-component.adoc
+++ b/core/camel-base/src/main/docs/properties-component.adoc
@@ -127,7 +127,7 @@ The component supports the following options, which are
listed below.
| `camel.component.properties.auto-discover-properties-sources` | Whether to
automatically discovery instances of PropertiesSource from registry and service
factory. | true | Boolean
| `camel.component.properties.default-fallback-enabled` | If false, the
component does not attempt to find a default for the key by looking after the
colon separator. | true | Boolean
| `camel.component.properties.encoding` | Encoding to use when loading
properties file from the file system or classpath.
-If no encoding has been set, then the properties files is loaded using
ISO-8859-1 encoding (latin-1) as documented by
java.util.Properties#load(java.io.InputStream) | | String
+If no encoding has been set, then the properties files are loaded using
ISO-8859-1 encoding (latin-1) as documented by
java.util.Properties#load(java.io.InputStream) | | String
| `camel.component.properties.environment-variable-mode` | Sets the OS
environment variables mode (0 = never, 1 = fallback, 2 = override).
The default mode (override) is to use OS environment variables if present, and
override any existing properties.
OS environment variable mode is checked before JVM system property mode | 2 |
Integer
diff --git
a/core/camel-base/src/main/java/org/apache/camel/component/properties/AbstractLocationPropertiesSource.java
b/core/camel-base/src/main/java/org/apache/camel/component/properties/AbstractLocationPropertiesSource.java
index d77085d107a7..4621f32adae6 100644
---
a/core/camel-base/src/main/java/org/apache/camel/component/properties/AbstractLocationPropertiesSource.java
+++
b/core/camel-base/src/main/java/org/apache/camel/component/properties/AbstractLocationPropertiesSource.java
@@ -117,7 +117,7 @@ public abstract class AbstractLocationPropertiesSource
extends ServiceSupport
/**
* Strategy to prepare loaded properties before being used by Camel.
- * <p/>
+ * <p>
* This implementation will ensure values are trimmed, as loading
properties from a file with values having trailing
* spaces is not automatically trimmed by the Properties API from the JDK.
*
diff --git
a/core/camel-base/src/main/java/org/apache/camel/component/properties/PropertiesComponent.java
b/core/camel-base/src/main/java/org/apache/camel/component/properties/PropertiesComponent.java
index 513e8aa38e3f..e75e70319d47 100644
---
a/core/camel-base/src/main/java/org/apache/camel/component/properties/PropertiesComponent.java
+++
b/core/camel-base/src/main/java/org/apache/camel/component/properties/PropertiesComponent.java
@@ -76,9 +76,9 @@ public class PropertiesComponent extends ServiceSupport
public static final int SYSTEM_PROPERTIES_MODE_FALLBACK = 1;
/**
- * Check system properties variables) first, before trying the specified
properties. This allows system properties
- * to override any other property source (environment variable and then
system properties takes precedence).
- * <p/>
+ * Check system properties variables first, before trying the specified
properties. This allows system properties to
+ * override any other property source (environment variable and then
system properties take precedence).
+ * <p>
* This is the default.
*/
public static final int SYSTEM_PROPERTIES_MODE_OVERRIDE = 2;
@@ -90,14 +90,14 @@ public class PropertiesComponent extends ServiceSupport
/**
* Check OS environment variables if not resolvable in the specified
properties.
- * <p/>
+ * <p>
* This is the default.
*/
public static final int ENVIRONMENT_VARIABLES_MODE_FALLBACK = 1;
/**
* Check OS environment variables first, before trying the specified
properties. This allows environment variables
- * to override any other property source (environment variable and then
system properties takes precedence).
+ * to override any other property source (environment variable and then
system properties take precedence).
*/
public static final int ENVIRONMENT_VARIABLES_MODE_OVERRIDE = 2;
@@ -499,8 +499,8 @@ public class PropertiesComponent extends ServiceSupport
/**
* Encoding to use when loading properties file from the file system or
classpath.
- * <p/>
- * If no encoding has been set, then the properties files is loaded using
ISO-8859-1 encoding (latin-1) as
+ * <p>
+ * If no encoding has been set, then the properties files are loaded using
ISO-8859-1 encoding (latin-1) as
* documented by {@link java.util.Properties#load(java.io.InputStream)}
*/
@Override
@@ -638,8 +638,8 @@ public class PropertiesComponent extends ServiceSupport
}
/**
- * Gets a list of properties that are local for the current thread only
(ie thread local), or <tt>null</tt> if not
- * currently in use.
+ * Gets a list of properties that are local for the current thread only
(ie thread local), or <code>null</code> if
+ * not currently in use.
*/
public Properties getLocalProperties() {
Deque<Properties> stack = this.localProperties.get();
diff --git
a/core/camel-base/src/main/java/org/apache/camel/component/properties/PropertiesFunctionResolver.java
b/core/camel-base/src/main/java/org/apache/camel/component/properties/PropertiesFunctionResolver.java
index 06fe61a240a7..02010e4b8711 100644
---
a/core/camel-base/src/main/java/org/apache/camel/component/properties/PropertiesFunctionResolver.java
+++
b/core/camel-base/src/main/java/org/apache/camel/component/properties/PropertiesFunctionResolver.java
@@ -46,7 +46,7 @@ public interface PropertiesFunctionResolver {
* Resolves the properties function with the given name
*
* @param name the name of the properties function
- * @return the function or <tt>null</tt> if not found
+ * @return the function or <code>null</code> if not found
*/
PropertiesFunction resolvePropertiesFunction(String name);
diff --git
a/core/camel-base/src/main/java/org/apache/camel/component/properties/PropertiesLookup.java
b/core/camel-base/src/main/java/org/apache/camel/component/properties/PropertiesLookup.java
index 0c8aa15350da..364b4d01eec8 100644
---
a/core/camel-base/src/main/java/org/apache/camel/component/properties/PropertiesLookup.java
+++
b/core/camel-base/src/main/java/org/apache/camel/component/properties/PropertiesLookup.java
@@ -27,7 +27,7 @@ public interface PropertiesLookup {
*
* @param name property name
* @param defaultValue default value for the property (if any exists)
- * @return the property value, or <tt>null</tt> if the
properties does not exist.
+ * @return the property value, or <code>null</code> if the
property does not exist.
*/
String lookup(String name, String defaultValue);
diff --git
a/core/camel-base/src/main/java/org/apache/camel/component/properties/PropertiesParser.java
b/core/camel-base/src/main/java/org/apache/camel/component/properties/PropertiesParser.java
index 7299188fc8f9..1a53c9945422 100644
---
a/core/camel-base/src/main/java/org/apache/camel/component/properties/PropertiesParser.java
+++
b/core/camel-base/src/main/java/org/apache/camel/component/properties/PropertiesParser.java
@@ -41,7 +41,7 @@ public interface PropertiesParser {
/**
* While parsing the uri using parseUri method each parsed property found
invokes this callback.
- * <p/>
+ * <p>
* This strategy method allows you to hook into the parsing and do custom
lookup and return the actual value to use.
*
* @param key the key
@@ -55,7 +55,7 @@ public interface PropertiesParser {
* Allow custom providers to attempt to lookup the property
*
* @param key the key
- * @return the value if found or <tt>null</tt> if none found
+ * @return the value if found or <code>null</code> if none found
*/
default String customLookup(String key) {
return null;
diff --git
a/core/camel-base/src/main/java/org/apache/camel/component/properties/ServiceHostPropertiesFunction.java
b/core/camel-base/src/main/java/org/apache/camel/component/properties/ServiceHostPropertiesFunction.java
index 4c10798a6711..d8114d1a4c8a 100644
---
a/core/camel-base/src/main/java/org/apache/camel/component/properties/ServiceHostPropertiesFunction.java
+++
b/core/camel-base/src/main/java/org/apache/camel/component/properties/ServiceHostPropertiesFunction.java
@@ -21,15 +21,15 @@ import org.apache.camel.util.IOHelper;
import org.apache.camel.util.StringHelper;
/**
- * A {@link PropertiesFunction} that lookup the property value from OS
environment variables using the service idiom.
- * <p/>
- * A service is defined using two environment variables where name is name of
the service:
+ * A {@link PropertiesFunction} that looks up the property value from OS
environment variables using the service idiom.
+ * <p>
+ * A service is defined using two environment variables where NAME is the name
of the service:
* <ul>
- * <li><tt>NAME_SERVICE_HOST</tt></li>
- * <li><tt>NAME_SERVICE_PORT</tt></li>
+ * <li><code>NAME_SERVICE_HOST</code></li>
+ * <li><code>NAME_SERVICE_PORT</code></li>
* </ul>
- * in other words the service uses <tt>_SERVICE_HOST</tt> and
<tt>_SERVICE_PORT</tt> as prefix.
- * <p/>
+ * in other words the service uses <code>_SERVICE_HOST</code> and
<code>_SERVICE_PORT</code> as suffix.
+ * <p>
* This implementation is to return the host part only.
*
* @see ServicePropertiesFunction
diff --git
a/core/camel-base/src/main/java/org/apache/camel/component/properties/ServicePortPropertiesFunction.java
b/core/camel-base/src/main/java/org/apache/camel/component/properties/ServicePortPropertiesFunction.java
index 6a9a12bed9b2..af67c7ac9a06 100644
---
a/core/camel-base/src/main/java/org/apache/camel/component/properties/ServicePortPropertiesFunction.java
+++
b/core/camel-base/src/main/java/org/apache/camel/component/properties/ServicePortPropertiesFunction.java
@@ -21,15 +21,15 @@ import org.apache.camel.util.IOHelper;
import org.apache.camel.util.StringHelper;
/**
- * A {@link PropertiesFunction} that lookup the property value from OS
environment variables using the service idiom.
- * <p/>
- * A service is defined using two environment variables where name is name of
the service:
+ * A {@link PropertiesFunction} that looks up the property value from OS
environment variables using the service idiom.
+ * <p>
+ * A service is defined using two environment variables where NAME is the name
of the service:
* <ul>
- * <li><tt>NAME_SERVICE_HOST</tt></li>
- * <li><tt>NAME_SERVICE_PORT</tt></li>
+ * <li><code>NAME_SERVICE_HOST</code></li>
+ * <li><code>NAME_SERVICE_PORT</code></li>
* </ul>
- * in other words the service uses <tt>_SERVICE_HOST</tt> and
<tt>_SERVICE_PORT</tt> as prefix.
- * <p/>
+ * in other words the service uses <code>_SERVICE_HOST</code> and
<code>_SERVICE_PORT</code> as suffix.
+ * <p>
* This implementation is to return the port part only.
*
* @see ServicePropertiesFunction
diff --git
a/core/camel-base/src/main/java/org/apache/camel/component/properties/ServicePropertiesFunction.java
b/core/camel-base/src/main/java/org/apache/camel/component/properties/ServicePropertiesFunction.java
index 348b5d01d7b4..61a5d1a2ef31 100644
---
a/core/camel-base/src/main/java/org/apache/camel/component/properties/ServicePropertiesFunction.java
+++
b/core/camel-base/src/main/java/org/apache/camel/component/properties/ServicePropertiesFunction.java
@@ -21,14 +21,14 @@ import org.apache.camel.util.IOHelper;
import org.apache.camel.util.StringHelper;
/**
- * A {@link PropertiesFunction} that lookup the property value from OS
environment variables using the service idiom.
- * <p/>
- * A service is defined using two environment variables where name is name of
the service:
+ * A {@link PropertiesFunction} that looks up the property value from OS
environment variables using the service idiom.
+ * <p>
+ * A service is defined using two environment variables where NAME is the name
of the service:
* <ul>
- * <li><tt>NAME_SERVICE_HOST</tt></li>
- * <li><tt>NAME_SERVICE_PORT</tt></li>
+ * <li><code>NAME_SERVICE_HOST</code></li>
+ * <li><code>NAME_SERVICE_PORT</code></li>
* </ul>
- * in other words the service uses <tt>_SERVICE_HOST</tt> and
<tt>_SERVICE_PORT</tt> as prefix.
+ * in other words the service uses <code>_SERVICE_HOST</code> and
<code>_SERVICE_PORT</code> as suffix.
*/
public class ServicePropertiesFunction implements PropertiesFunction {
diff --git
a/core/camel-base/src/main/java/org/apache/camel/impl/converter/AnnotationTypeConverterLoader.java
b/core/camel-base/src/main/java/org/apache/camel/impl/converter/AnnotationTypeConverterLoader.java
index 542a0db2fafe..6307e50c7932 100644
---
a/core/camel-base/src/main/java/org/apache/camel/impl/converter/AnnotationTypeConverterLoader.java
+++
b/core/camel-base/src/main/java/org/apache/camel/impl/converter/AnnotationTypeConverterLoader.java
@@ -53,13 +53,13 @@ import static java.lang.reflect.Modifier.isStatic;
/**
* A class which will auto-discover {@link Converter} objects and methods to
pre-load the {@link TypeConverterRegistry}
* of converters on startup.
- * <p/>
+ * <p>
* This implementation supports scanning for type converters in JAR files. The
{@link #META_INF_SERVICES} contains a
- * list of packages or FQN class names for {@link Converter} classes. The FQN
class names is loaded first and directly
+ * list of packages or FQN class names for {@link Converter} classes. The FQN
class names are loaded first and directly
* by the class loader.
- * <p/>
+ * <p>
* The {@link PackageScanClassResolver} is being used to scan packages for
{@link Converter} classes and this procedure
- * is slower than loading the {@link Converter} classes directly by its FQN
class name. Therefore its recommended to
+ * is slower than loading the {@link Converter} classes directly by its FQN
class name. Therefore it is recommended to
* specify FQN class names in the {@link #META_INF_SERVICES} file. Likewise
the procedure for scanning using
* {@link PackageScanClassResolver} may require custom implementations to work
in various containers such as JBoss,
* OSGi, etc.
@@ -148,7 +148,7 @@ public class AnnotationTypeConverterLoader implements
TypeConverterLoader {
/**
* Filters the given list of packages and returns an array of <b>only</b>
package names.
- * <p/>
+ * <p>
* This implementation will check the given list of packages, and if it
contains a class name, that class will be
* loaded directly and added to the list of classes. This optimizes the
type converter to avoid excessive file
* scanning for .class files.
diff --git
a/core/camel-base/src/main/java/org/apache/camel/impl/converter/DefaultTypeConverter.java
b/core/camel-base/src/main/java/org/apache/camel/impl/converter/DefaultTypeConverter.java
index c1dee5551749..cfc8fde285cf 100644
---
a/core/camel-base/src/main/java/org/apache/camel/impl/converter/DefaultTypeConverter.java
+++
b/core/camel-base/src/main/java/org/apache/camel/impl/converter/DefaultTypeConverter.java
@@ -29,7 +29,7 @@ import org.slf4j.LoggerFactory;
/**
* Default implementation of a type converter registry used for
* <a href="http://camel.apache.org/type-converter.html";>type converters</a>
in Camel.
- * <p/>
+ * <p>
* This implementation will load type converters up-front on startup.
*/
public class DefaultTypeConverter extends BaseTypeConverterRegistry implements
AnnotationScanTypeConverters {
diff --git
a/core/camel-base/src/main/java/org/apache/camel/impl/converter/TypeConvertersPackageScanClassResolver.java
b/core/camel-base/src/main/java/org/apache/camel/impl/converter/TypeConvertersPackageScanClassResolver.java
index 3a26dc17504d..85806810c2f3 100644
---
a/core/camel-base/src/main/java/org/apache/camel/impl/converter/TypeConvertersPackageScanClassResolver.java
+++
b/core/camel-base/src/main/java/org/apache/camel/impl/converter/TypeConvertersPackageScanClassResolver.java
@@ -28,7 +28,7 @@ import org.apache.camel.support.service.ServiceSupport;
/**
* A {@link org.apache.camel.spi.ClassResolver} which loads type converters
from an instance that implements
* {@link org.apache.camel.TypeConverters}.
- * <p/>
+ * <p>
* This is used when adding converters manually using the
* {@link
org.apache.camel.impl.converter.BaseTypeConverterRegistry#addTypeConverters(org.apache.camel.TypeConverters)}
* method.
diff --git
a/core/camel-base/src/main/java/org/apache/camel/impl/event/ExchangeCreatedEvent.java
b/core/camel-base/src/main/java/org/apache/camel/impl/event/ExchangeCreatedEvent.java
index 6dcadf6f1919..47f1fc1a250e 100644
---
a/core/camel-base/src/main/java/org/apache/camel/impl/event/ExchangeCreatedEvent.java
+++
b/core/camel-base/src/main/java/org/apache/camel/impl/event/ExchangeCreatedEvent.java
@@ -23,9 +23,9 @@ import org.apache.camel.spi.CamelEvent;
/**
* Event after an {@link Exchange} has been created.
- * <p/>
- * <b>Notice:</b> This event may be emitted after an {@link
ExchangeSendingEvent}, and therefore its not guaranteed this
- * event is the first event being send for a given {@link Exchange} lifecycle.
+ * <p>
+ * <b>Notice:</b> This event may be emitted after an {@link
ExchangeSendingEvent}, and therefore it is not guaranteed
+ * this event is the first event being sent for a given {@link Exchange}
lifecycle.
*/
public class ExchangeCreatedEvent extends AbstractExchangeEvent implements
CamelEvent.ExchangeCreatedEvent {
private static final @Serial long serialVersionUID = -19248832613958243L;
diff --git
a/core/camel-base/src/main/java/org/apache/camel/impl/event/ExchangeSendingEvent.java
b/core/camel-base/src/main/java/org/apache/camel/impl/event/ExchangeSendingEvent.java
index d4904749f841..d183be6642ba 100644
---
a/core/camel-base/src/main/java/org/apache/camel/impl/event/ExchangeSendingEvent.java
+++
b/core/camel-base/src/main/java/org/apache/camel/impl/event/ExchangeSendingEvent.java
@@ -24,15 +24,15 @@ import org.apache.camel.spi.CamelEvent;
/**
* Event for <b>before</b> sending an {@link Exchange} to an {@link Endpoint}.
- * <p/>
+ * <p>
* This event is emitted before attempting to send the {@link Exchange} to an
{@link Endpoint}. There is still some
- * internal processing done before the actual sending takes places, and
therefore it is not 100% guaranteed that the
+ * internal processing done before the actual sending takes place, and
therefore it is not 100% guaranteed that the
* sending actually happens, as an internal error may occur.
- * <p/>
+ * <p>
* The {@link ExchangeSentEvent} is an event which is emitted <b>after</b> the
sending is done.
- * <p/>
- * These two events (sending and sent) come in a pair, and therefore you need
to make sure to return <tt>true</tt> for
- * both events in the {@link
org.apache.camel.spi.EventNotifier#isEnabled(CamelEvent)} method to receive
events for
+ * <p>
+ * These two events (sending and sent) come in a pair, and therefore you need
to make sure to return <code>true</code>
+ * for both events in the {@link
org.apache.camel.spi.EventNotifier#isEnabled(CamelEvent)} method to receive
events for
* either of them.
*
* @see ExchangeSentEvent
diff --git
a/core/camel-base/src/main/java/org/apache/camel/impl/event/ExchangeSentEvent.java
b/core/camel-base/src/main/java/org/apache/camel/impl/event/ExchangeSentEvent.java
index 3fe162171192..ceacd25e6816 100644
---
a/core/camel-base/src/main/java/org/apache/camel/impl/event/ExchangeSentEvent.java
+++
b/core/camel-base/src/main/java/org/apache/camel/impl/event/ExchangeSentEvent.java
@@ -26,9 +26,9 @@ import org.apache.camel.util.TimeUtils;
/**
* Event for <b>after</b> an {@link Exchange} has been sent to an {@link
Endpoint}. The {@link ExchangeSentEvent} is an
* event which is emitted <b>after</b> the sending is done.
- * <p/>
- * These two events (sending and sent) come in a pair, and therefore you need
to make sure to return <tt>true</tt> for
- * both events in the {@link
org.apache.camel.spi.EventNotifier#isEnabled(CamelEvent)} method to receive
events for
+ * <p>
+ * These two events (sending and sent) come in a pair, and therefore you need
to make sure to return <code>true</code>
+ * for both events in the {@link
org.apache.camel.spi.EventNotifier#isEnabled(CamelEvent)} method to receive
events for
* either of them.
*
* @see ExchangeSendingEvent
diff --git
a/core/camel-core-languages/src/main/java/org/apache/camel/language/simple/BaseSimpleParser.java
b/core/camel-core-languages/src/main/java/org/apache/camel/language/simple/BaseSimpleParser.java
index 4450f894acc6..3d6740b4b75d 100644
---
a/core/camel-core-languages/src/main/java/org/apache/camel/language/simple/BaseSimpleParser.java
+++
b/core/camel-core-languages/src/main/java/org/apache/camel/language/simple/BaseSimpleParser.java
@@ -41,7 +41,7 @@ import
org.apache.camel.language.simple.types.UnaryOperatorType;
/**
* Base class for Simple language parser.
- * <p/>
+ * <p>
* This parser is based on the principles of a <a
href="http://en.wikipedia.org/wiki/Recursive_descent_parser";>recursive
* descent parser</a>.
*/
@@ -134,11 +134,11 @@ public abstract class BaseSimpleParser {
/**
* Prepares blocks, such as functions, single or double-quoted texts.
- * <p/>
+ * <p>
* This process prepares the {@link Block}s in the AST. This is done by
linking child {@link SimpleNode nodes} which
* are within the start and end of the blocks, as child to the given
block. This is done to have the AST graph
* updated and prepared properly.
- * <p/>
+ * <p>
* So when the AST node is later used to create the {@link
org.apache.camel.Predicate}s or
* {@link org.apache.camel.Expression}s to be used by Camel then the AST
graph has a linked and prepared graph of
* nodes which represent the input expression.
@@ -188,10 +188,10 @@ public abstract class BaseSimpleParser {
/**
* Prepares unary expressions.
- * <p/>
+ * <p>
* This process prepares the unary expressions in the AST. This is done by
linking the unary operator with the left
* hand side node, to have the AST graph updated and prepared properly.
- * <p/>
+ * <p>
* So when the AST node is later used to create the {@link
org.apache.camel.Predicate}s or
* {@link org.apache.camel.Expression}s to be used by Camel then the AST
graph has a linked and prepared graph of
* nodes which represent the input expression.
@@ -241,10 +241,10 @@ public abstract class BaseSimpleParser {
/**
* Prepares chain expressions.
- * <p/>
+ * <p>
* This process prepares the other expressions in the AST. This is done by
linking the other operator with both the
* right and left hand side nodes, to have the AST graph updated and
prepared properly.
- * <p/>
+ * <p>
* So when the AST node is later used to create the {@link Predicate}s to
be used by Camel then the AST graph has a
* linked and prepared graph of nodes which represent the input expression.
*/
@@ -365,10 +365,10 @@ public abstract class BaseSimpleParser {
/**
* Prepares ternary expressions.
- * <p/>
+ * <p>
* This process prepares the ternary expressions in the AST. This is done
by linking the ternary operator (condition
* ? trueValue : falseValue) with all three parts: condition, trueValue,
and falseValue.
- * <p/>
+ * <p>
* The ternary operator consists of two tokens: ? and : We need to find
the pattern: condition ? trueValue :
* falseValue
*/
@@ -445,12 +445,12 @@ public abstract class BaseSimpleParser {
/**
* Accept the given token.
- * <p/>
+ * <p>
* This is to be used by the grammar to accept tokens and then continue
parsing using the grammar, such as a
* function grammar.
*
* @param accept the token
- * @return <tt>true</tt> if accepted, <tt>false</tt> otherwise.
+ * @return <code>true</code> if accepted, <code>false</code>
otherwise.
*/
protected boolean accept(TokenType accept) {
return token == null || token.getType().getType() == accept;
@@ -511,7 +511,7 @@ public abstract class BaseSimpleParser {
/**
* Expect and accept a given number of tokens in sequence.
- * <p/>
+ * <p>
* This is used to accept whitespace or string literals.
*
* @param expect the token to accept
diff --git
a/core/camel-core-languages/src/main/java/org/apache/camel/language/simple/SimpleExpressionParser.java
b/core/camel-core-languages/src/main/java/org/apache/camel/language/simple/SimpleExpressionParser.java
index b26d6adcb9cb..250dbd7fb363 100644
---
a/core/camel-core-languages/src/main/java/org/apache/camel/language/simple/SimpleExpressionParser.java
+++
b/core/camel-core-languages/src/main/java/org/apache/camel/language/simple/SimpleExpressionParser.java
@@ -173,7 +173,7 @@ public class SimpleExpressionParser extends
BaseSimpleParser {
/**
* Removes any ignorable whitespace tokens before and after other
operators.
- * <p/>
+ * <p>
* During the initial parsing (input -> tokens), then there may be
excessive whitespace tokens, which can safely be
* removed, which makes the succeeding parsing easier.
*/
diff --git
a/core/camel-core-languages/src/main/java/org/apache/camel/language/simple/SimpleInitBlockTokenizer.java
b/core/camel-core-languages/src/main/java/org/apache/camel/language/simple/SimpleInitBlockTokenizer.java
index 628eb7868b49..94b41ca39c4b 100644
---
a/core/camel-core-languages/src/main/java/org/apache/camel/language/simple/SimpleInitBlockTokenizer.java
+++
b/core/camel-core-languages/src/main/java/org/apache/camel/language/simple/SimpleInitBlockTokenizer.java
@@ -52,7 +52,7 @@ public class SimpleInitBlockTokenizer extends SimpleTokenizer
{
* Does the expression include a simple init block.
*
* @param expression the expression
- * @return <tt>true</tt> if init block exists
+ * @return <code>true</code> if init block exists
*/
public static boolean hasInitBlock(String expression) {
if (expression != null) {
diff --git
a/core/camel-core-languages/src/main/java/org/apache/camel/language/simple/SimplePredicateParser.java
b/core/camel-core-languages/src/main/java/org/apache/camel/language/simple/SimplePredicateParser.java
index c0077b362185..beb048922b1b 100644
---
a/core/camel-core-languages/src/main/java/org/apache/camel/language/simple/SimplePredicateParser.java
+++
b/core/camel-core-languages/src/main/java/org/apache/camel/language/simple/SimplePredicateParser.java
@@ -186,10 +186,10 @@ public class SimplePredicateParser extends
BaseSimpleParser {
}
/**
- * Parses the tokens and crates the AST nodes.
- * <p/>
+ * Parses the tokens and creates the AST nodes.
+ * <p>
* After the initial parsing of the input (input -> tokens) then we parse
again (tokens -> ast).
- * <p/>
+ * <p>
* In this parsing the balance of the blocks is checked, so that each
block has a matching start and end token. For
* example a single quote block, or a function block etc.
*/
@@ -299,7 +299,7 @@ public class SimplePredicateParser extends BaseSimpleParser
{
* @param startSingle state of single quoted blocks
* @param startDouble state of double quoted blocks
* @param startFunction state of function blocks
- * @return the created node, or <tt>null</tt> to let a
default node be created instead.
+ * @return the created node, or <code>null</code> to let a
default node be created instead.
*/
private SimpleNode createNode(
SimpleToken token, AtomicBoolean startSingle, AtomicBoolean
startDouble,
@@ -385,7 +385,7 @@ public class SimplePredicateParser extends BaseSimpleParser
{
/**
* Removes any ignorable whitespace tokens.
- * <p/>
+ * <p>
* During the initial parsing (input -> tokens), then there may be
excessive whitespace tokens, which can safely be
* removed, which makes the succeeding parsing easier.
*/
@@ -422,10 +422,10 @@ public class SimplePredicateParser extends
BaseSimpleParser {
/**
* Prepares binary expressions.
- * <p/>
+ * <p>
* This process prepares the binary expressions in the AST. This is done
by linking the binary operator with both
* the right and left hand side nodes, to have the AST graph updated and
prepared properly.
- * <p/>
+ * <p>
* So when the AST node is later used to create the {@link Predicate}s to
be used by Camel then the AST graph has a
* linked and prepared graph of nodes which represent the input expression.
*/
@@ -485,10 +485,10 @@ public class SimplePredicateParser extends
BaseSimpleParser {
/**
* Prepares logical expressions.
- * <p/>
+ * <p>
* This process prepares the logical expressions in the AST. This is done
by linking the logical operator with both
* the right and left hand side nodes, to have the AST graph updated and
prepared properly.
- * <p/>
+ * <p>
* So when the AST node is later used to create the {@link Predicate}s to
be used by Camel then the AST graph has a
* linked and prepared graph of nodes which represent the input expression.
*/
@@ -549,7 +549,7 @@ public class SimplePredicateParser extends BaseSimpleParser
{
/**
* Creates the {@link Predicate}s from the AST nodes.
*
- * @return the created {@link Predicate}s, is never <tt>null</tt>.
+ * @return the created {@link Predicate}s, is never <code>null</code>.
*/
private List<Predicate> createPredicates() {
List<Predicate> answer = new ArrayList<>();
diff --git
a/core/camel-core-languages/src/main/java/org/apache/camel/language/simple/SimpleSyntaxHints.java
b/core/camel-core-languages/src/main/java/org/apache/camel/language/simple/SimpleSyntaxHints.java
index a059985b0ce3..743c13bd0119 100644
---
a/core/camel-core-languages/src/main/java/org/apache/camel/language/simple/SimpleSyntaxHints.java
+++
b/core/camel-core-languages/src/main/java/org/apache/camel/language/simple/SimpleSyntaxHints.java
@@ -280,7 +280,7 @@ public final class SimpleSyntaxHints {
/**
* Wraps the function references of a predicate written inside {@code ${
}} so that it can be parsed as one:
* {@code body != null && body.size() > 0} becomes {@code ${body} != null
&& ${body.size()} > 0}.
- * <p/>
+ * <p>
* Each comparison is wrapped, not only the first, so that a compound
condition reads the way it looks (CAMEL-24920,
* CAMEL-24921). An operator counts only when whitespace surrounds it
outside quotes, brackets and parentheses,
* which is what keeps {@code ${header.Content-Length}} and {@code
${date:now:yyyy-MM-dd}} a plain function, and an
@@ -405,7 +405,7 @@ public final class SimpleSyntaxHints {
* The elvis operator written inside {@code ${ }}, as the same expression
with the operator after the function:
* {@code header.a ?: 'x'} is {@code ${header.a} ?: 'x'}, and {@code
header.a ?: ${header.b} ?: 'x'} is
* {@code ${header.a} ?: ${header.b} ?: 'x'}; null when the text has no
elvis operator (CAMEL-26401).
- * <p/>
+ * <p>
* Like the other operators it counts only with a space on both sides,
outside quotes, brackets, parentheses and
* nested functions, so {@code ${header.a ?:10}} is a header named {@code
a ?:10}, as {@code ?:10} after the braces
* is text, and {@code ${body.replace('a ?: b', '')}} is a function. The
default value of a property is text too:
diff --git
a/core/camel-core-languages/src/main/java/org/apache/camel/language/simple/SimpleTokenizer.java
b/core/camel-core-languages/src/main/java/org/apache/camel/language/simple/SimpleTokenizer.java
index 81f90cef2dc3..544b22489640 100644
---
a/core/camel-core-languages/src/main/java/org/apache/camel/language/simple/SimpleTokenizer.java
+++
b/core/camel-core-languages/src/main/java/org/apache/camel/language/simple/SimpleTokenizer.java
@@ -124,7 +124,7 @@ public class SimpleTokenizer {
* Does the expression include a simple function.
*
* @param expression the expression
- * @return <tt>true</tt> if one or more simple function is
included in the expression
+ * @return <code>true</code> if one or more simple functions
are included in the expression
*/
public static boolean hasFunctionStartToken(String expression) {
if (expression != null) {
@@ -134,10 +134,10 @@ public class SimpleTokenizer {
}
/**
- * Does the expression include an escape tokens.
+ * Does the expression include any escape tokens.
*
* @param expression the expression
- * @return <tt>true</tt> if one or more escape tokens is
included in the expression
+ * @return <code>true</code> if one or more escape tokens are
included in the expression
*/
public static boolean hasEscapeToken(String expression) {
if (expression != null) {
diff --git
a/core/camel-core-languages/src/main/java/org/apache/camel/language/simple/StringExpressionBuilder.java
b/core/camel-core-languages/src/main/java/org/apache/camel/language/simple/StringExpressionBuilder.java
index 12ea1031c213..7bab0df35ff9 100644
---
a/core/camel-core-languages/src/main/java/org/apache/camel/language/simple/StringExpressionBuilder.java
+++
b/core/camel-core-languages/src/main/java/org/apache/camel/language/simple/StringExpressionBuilder.java
@@ -546,11 +546,11 @@ public final class StringExpressionBuilder {
}
/**
- * Returns an expression that escapes special characters in the given
expression (or message body if <tt>null</tt>)
- * according to the escape kind.
+ * Returns an expression that escapes special characters in the given
expression (or message body if
+ * <code>null</code>) according to the escape kind.
*
* @param kind the kind of escaping (html, xml, json, js, sql, url)
- * @param expression the expression to escape, or <tt>null</tt> to use the
message body
+ * @param expression the expression to escape, or <code>null</code> to use
the message body
*/
public static Expression escapeExpression(final EscapeHelper.Kind kind,
final String expression) {
return new ExpressionAdapter() {
diff --git
a/core/camel-core-languages/src/main/java/org/apache/camel/language/simple/ast/Block.java
b/core/camel-core-languages/src/main/java/org/apache/camel/language/simple/ast/Block.java
index 529acad9577d..3102c8e1fb84 100644
---
a/core/camel-core-languages/src/main/java/org/apache/camel/language/simple/ast/Block.java
+++
b/core/camel-core-languages/src/main/java/org/apache/camel/language/simple/ast/Block.java
@@ -18,8 +18,8 @@ package org.apache.camel.language.simple.ast;
/**
* A model which is a block, containing other nodes.
- * <p/>
- * This node will keep adding other nodes until no longer accepted, by
returning <tt>false</tt> in the
+ * <p>
+ * This node will keep adding other nodes until no longer accepted, by
returning <code>false</code> in the
* {@link #acceptAndAddNode(SimpleNode)} method.
*/
public interface Block extends SimpleNode {
@@ -28,7 +28,7 @@ public interface Block extends SimpleNode {
* Whether to accept and add the given node in this block.
*
* @param node the other node.
- * @return <tt>true</tt> to accept and add to this block,
<tt>false</tt> to end this block.
+ * @return <code>true</code> to accept and add to this block,
<code>false</code> to end this block.
*/
boolean acceptAndAddNode(SimpleNode node);
diff --git
a/core/camel-core-languages/src/main/java/org/apache/camel/language/simple/ast/LiteralNode.java
b/core/camel-core-languages/src/main/java/org/apache/camel/language/simple/ast/LiteralNode.java
index 4330c08f5e35..36d25cf60c96 100644
---
a/core/camel-core-languages/src/main/java/org/apache/camel/language/simple/ast/LiteralNode.java
+++
b/core/camel-core-languages/src/main/java/org/apache/camel/language/simple/ast/LiteralNode.java
@@ -23,7 +23,7 @@ public interface LiteralNode extends SimpleNode {
/**
* Adds the given text to this model.
- * <p/>
+ * <p>
* This operation can be invoked multiple times to add more text.
*
* @param text the text to add
@@ -33,15 +33,15 @@ public interface LiteralNode extends SimpleNode {
/**
* Gets the text
*
- * @return the text, will never be <tt>null</tt>, but may contain an empty
string.
+ * @return the text, will never be <code>null</code>, but may contain an
empty string.
*/
String getText();
/**
* Whether to quote embedded nodes.
- * <p/>
- * Some functions such as the <tt>bean:</tt> function would need to quote
its embedded nodes as they are parameter
- * values for method names.
+ * <p>
+ * Some functions such as the <code>bean:</code> function would need to
quote its embedded nodes as they are
+ * parameter values for method names.
*/
boolean quoteEmbeddedNodes();
diff --git
a/core/camel-core-languages/src/main/java/org/apache/camel/language/simple/ast/SimpleFunctionExpression.java
b/core/camel-core-languages/src/main/java/org/apache/camel/language/simple/ast/SimpleFunctionExpression.java
index 42252da53cb8..08ee62642bac 100644
---
a/core/camel-core-languages/src/main/java/org/apache/camel/language/simple/ast/SimpleFunctionExpression.java
+++
b/core/camel-core-languages/src/main/java/org/apache/camel/language/simple/ast/SimpleFunctionExpression.java
@@ -109,7 +109,7 @@ public class SimpleFunctionExpression extends
LiteralExpression {
/**
* A predicate written inside the braces, as an expression that answers
whether it matches; null when the text is
* not a predicate but a plain function (CAMEL-24921).
- * <p/>
+ * <p>
* An operator counts only when whitespace surrounds it outside quotes, so
{@code ${header.Content-Length}} and
* {@code ${date:now:yyyy-MM-dd}} are names, not arithmetic.
*/
diff --git
a/core/camel-core-languages/src/main/java/org/apache/camel/language/simple/functions/MiscFunctionFactory.java
b/core/camel-core-languages/src/main/java/org/apache/camel/language/simple/functions/MiscFunctionFactory.java
index e35faf62ac0e..2e26d45bd1fe 100644
---
a/core/camel-core-languages/src/main/java/org/apache/camel/language/simple/functions/MiscFunctionFactory.java
+++
b/core/camel-core-languages/src/main/java/org/apache/camel/language/simple/functions/MiscFunctionFactory.java
@@ -34,8 +34,6 @@ import static
org.apache.camel.language.simple.SimpleFunctionHelper.ifStartsWith
* {@code ${isNumeric}}, {@code ${not}}, {@code ${kindOfType}}, {@code
${throwException}}, {@code ${assert}},
* {@code ${convertTo}}, {@code ${messageHistory}}, {@code ${uuid}}, {@code
${hash}}, {@code ${empty}},
* {@code ${newEmpty}}, {@code ${iif}}, {@code ${load}}.
- *
- * <p>
*/
public final class MiscFunctionFactory implements
SimpleLanguageFunctionFactory {
diff --git
a/core/camel-core-languages/src/main/java/org/apache/camel/language/simple/types/BinaryOperatorType.java
b/core/camel-core-languages/src/main/java/org/apache/camel/language/simple/types/BinaryOperatorType.java
index baa7e36e5c09..b579d8c56ad7 100644
---
a/core/camel-core-languages/src/main/java/org/apache/camel/language/simple/types/BinaryOperatorType.java
+++
b/core/camel-core-languages/src/main/java/org/apache/camel/language/simple/types/BinaryOperatorType.java
@@ -241,7 +241,7 @@ public enum BinaryOperatorType {
* Returns the types of right hand side parameters this operator supports.
*
* @param operator the operator
- * @return <tt>null</tt> if accepting all types, otherwise the
array of accepted types
+ * @return <code>null</code> if accepting all types, otherwise
the array of accepted types
*/
public static ParameterType[] supportedParameterTypes(BinaryOperatorType
operator) {
if (operator == EQ) {
diff --git
a/core/camel-core-languages/src/main/java/org/apache/camel/language/simple/types/SimpleIllegalSyntaxException.java
b/core/camel-core-languages/src/main/java/org/apache/camel/language/simple/types/SimpleIllegalSyntaxException.java
index a50e2c943078..6a10c669425f 100644
---
a/core/camel-core-languages/src/main/java/org/apache/camel/language/simple/types/SimpleIllegalSyntaxException.java
+++
b/core/camel-core-languages/src/main/java/org/apache/camel/language/simple/types/SimpleIllegalSyntaxException.java
@@ -44,8 +44,8 @@ public class SimpleIllegalSyntaxException extends
ExpressionIllegalSyntaxExcepti
/**
* Index where the parsing error occurred
*
- * @return index of the parsing error in the input, returns <tt>-1</tt> if
the cause of the problem is not
- * applicable to specific index in the input
+ * @return index of the parsing error in the input, returns
<code>-1</code> if the cause of the problem is not
+ * applicable to a specific index in the input
*/
public int getIndex() {
return index;
diff --git
a/core/camel-core-languages/src/main/java/org/apache/camel/language/simple/types/UnaryOperatorType.java
b/core/camel-core-languages/src/main/java/org/apache/camel/language/simple/types/UnaryOperatorType.java
index c6d0b6443a4a..923d88d11c22 100644
---
a/core/camel-core-languages/src/main/java/org/apache/camel/language/simple/types/UnaryOperatorType.java
+++
b/core/camel-core-languages/src/main/java/org/apache/camel/language/simple/types/UnaryOperatorType.java
@@ -18,8 +18,8 @@ package org.apache.camel.language.simple.types;
/**
* Types of unary operators supported.
- * <p/>
- * An unary operator can only work on the left hand side, which means the
operator should be defined directly
+ * <p>
+ * A unary operator can only work on the left hand side, which means the
operator should be defined directly
* <i>after</i> the function it should work upon.
*/
public enum UnaryOperatorType {
diff --git
a/core/camel-core-languages/src/main/java/org/apache/camel/language/tokenizer/TokenizeLanguage.java
b/core/camel-core-languages/src/main/java/org/apache/camel/language/tokenizer/TokenizeLanguage.java
index de7daf07135b..bc8b9b3863cf 100644
---
a/core/camel-core-languages/src/main/java/org/apache/camel/language/tokenizer/TokenizeLanguage.java
+++
b/core/camel-core-languages/src/main/java/org/apache/camel/language/tokenizer/TokenizeLanguage.java
@@ -32,15 +32,16 @@ import org.apache.camel.support.builder.ExpressionBuilder;
/**
* A language for tokenizer expressions.
- * <p/>
- * This tokenizer language can operator in the following modes:
+ * <p>
+ * This tokenizer language can operate in the following modes:
* <ul>
* <li>default - using a single tokenizer</li>
* <li>pair - using both start and end tokens</li>
* <li>xml - using both start and end tokens in XML mode, support inheriting
namespaces</li>
* </ul>
- * The default mode supports the <tt>headerName</tt> and <tt>regex</tt>
options. Where as the pair mode only supports
- * <tt>token</tt> and <tt>endToken</tt>. And the <tt>xml</tt> mode supports
the <tt>inheritNamespaceTagName</tt> option.
+ * The default mode supports the <code>headerName</code> and
<code>regex</code> options. Whereas the pair mode only
+ * supports <code>token</code> and <code>endToken</code>. And the
<code>xml</code> mode supports the
+ * <code>inheritNamespaceTagName</code> option.
*/
@Language("tokenize")
@BodyTypes(expressionIn = @BodyType(value = { Carrier.TEXT, Carrier.BYTES,
Carrier.STREAM, Carrier.FILE },
