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 da04d11c2b01 Reattach Javadoc blocks that were separated from the
member they document (#29641)
da04d11c2b01 is described below
commit da04d11c2b0198631b32955e34d4e64a8b2fa27f
Author: dhairya05 <[email protected]>
AuthorDate: Thu Nov 12 00:20:18 2026 +0530
Reattach Javadoc blocks that were separated from the member they document
(#29641)
Where a member was inserted between a Javadoc block and the member it
documents, the earlier block was
silently dropped by Javadoc. Reattach each orphaned block to its member, or
remove it when the member is gone.
---
.../utils/cassandra/CassandraSessionHolder.java | 4 ----
.../apache/camel/component/chaos/ChaosRule.java | 24 +++++++++++-----------
.../GoogleSheetsJsonStructDataTypeTransformer.java | 8 ++++----
.../easypredicate/EasyPredicateOperators.java | 3 ---
.../camel/language/simple/SimpleTokenizer.java | 16 +++++++--------
.../org/apache/camel/java/in/JavaChainParser.java | 8 ++++----
.../packaging/EndpointSchemaGeneratorMojo.java | 12 +++++------
7 files changed, 34 insertions(+), 41 deletions(-)
diff --git
a/components/camel-cassandraql/src/main/java/org/apache/camel/utils/cassandra/CassandraSessionHolder.java
b/components/camel-cassandraql/src/main/java/org/apache/camel/utils/cassandra/CassandraSessionHolder.java
index c0f21edc71fa..6dda8217f54d 100644
---
a/components/camel-cassandraql/src/main/java/org/apache/camel/utils/cassandra/CassandraSessionHolder.java
+++
b/components/camel-cassandraql/src/main/java/org/apache/camel/utils/cassandra/CassandraSessionHolder.java
@@ -26,10 +26,6 @@ public class CassandraSessionHolder {
* Session
*/
private CqlSession session;
- /**
- * Keyspace name
- */
- //private String keyspace; // this field is reported unused
/**
* Indicates whether Session is externally managed
*/
diff --git
a/components/camel-chaos/src/main/java/org/apache/camel/component/chaos/ChaosRule.java
b/components/camel-chaos/src/main/java/org/apache/camel/component/chaos/ChaosRule.java
index 3c65e2831255..35098eeee1de 100644
---
a/components/camel-chaos/src/main/java/org/apache/camel/component/chaos/ChaosRule.java
+++
b/components/camel-chaos/src/main/java/org/apache/camel/component/chaos/ChaosRule.java
@@ -838,12 +838,6 @@ final class ChaosRule {
return in == null || matchesIn(ChaosExchangeState.routeId(exchange));
}
- /**
- * Whether the message meets the condition of {@code when=} (true for a
rule without one). A condition that throws
- * is not met, and counts as skipped. A condition on the body reads a
stream body from its cache: a stream that is
- * not cached yet (such as the reply of a send) is cached first, and the
cache is reset after the check, so the
- * route reads the body as before.
- */
/**
* The key of the message as it enters a route, for an expectation of
duplicates (CAMEL-26791): the value of key=,
* else the body as text. Null when there is none (no body, an empty one,
or a stream that cannot be read twice), as
@@ -881,6 +875,12 @@ final class ChaosRule {
}
}
+ /**
+ * Whether the message meets the condition of {@code when=} (true for a
rule without one). A condition that throws
+ * is not met, and counts as skipped. A condition on the body reads a
stream body from its cache: a stream that is
+ * not cached yet (such as the reply of a send) is cached first, and the
cache is reset after the check, so the
+ * route reads the body as before.
+ */
boolean matchesWhen(Exchange exchange) {
Predicate c = condition;
if (c == null) {
@@ -1246,12 +1246,6 @@ final class ChaosRule {
}
}
- /**
- * The effect of the faults of a rule on the exchanges it faulted, each
counted once when it is done: completed
- * (without a redelivery after the fault, such as after a delay),
recovered by a redelivery of the error handler,
- * handled by the error handler (such as the dead letter channel), or
failed. The others are still in flight. Only
- * the exchanges with a unit of work count, as it tells when the exchange
is done.
- */
/** What a rule did in one route: its faults there, and how the exchanges
it faulted there were done. */
static final class InRoute {
@@ -1259,6 +1253,12 @@ final class ChaosRule {
final Effect effect = new Effect();
}
+ /**
+ * The effect of the faults of a rule on the exchanges it faulted, each
counted once when it is done: completed
+ * (without a redelivery after the fault, such as after a delay),
recovered by a redelivery of the error handler,
+ * handled by the error handler (such as the dead letter channel), or
failed. The others are still in flight. Only
+ * the exchanges with a unit of work count, as it tells when the exchange
is done.
+ */
static final class Effect {
/** How an exchange was done, after the rule faulted it. */
diff --git
a/components/camel-google/camel-google-sheets/src/main/java/org/apache/camel/component/google/sheets/transform/GoogleSheetsJsonStructDataTypeTransformer.java
b/components/camel-google/camel-google-sheets/src/main/java/org/apache/camel/component/google/sheets/transform/GoogleSheetsJsonStructDataTypeTransformer.java
index b9e791f0ca5d..12b039c984da 100644
---
a/components/camel-google/camel-google-sheets/src/main/java/org/apache/camel/component/google/sheets/transform/GoogleSheetsJsonStructDataTypeTransformer.java
+++
b/components/camel-google/camel-google-sheets/src/main/java/org/apache/camel/component/google/sheets/transform/GoogleSheetsJsonStructDataTypeTransformer.java
@@ -261,10 +261,6 @@ public class GoogleSheetsJsonStructDataTypeTransformer
extends Transformer {
return Optional.empty();
}
- /**
- * Converts message body to list of Json objects. Supports different
message body types such as List, String,
- * InputStream.
- */
/**
* A JSON object whose values property is an array of arrays is a
ValueRange.
*/
@@ -353,6 +349,10 @@ public class GoogleSheetsJsonStructDataTypeTransformer
extends Transformer {
return jsonBeans;
}
+ /**
+ * Converts message body to list of Json objects. Supports different
message body types such as List, String,
+ * InputStream.
+ */
private static List<String> bodyAsJsonBeans(Message message) throws
InvalidPayloadException, DeserializationException {
if (message.getBody() == null) {
return Collections.emptyList();
diff --git
a/components/camel-jsonpath/src/main/java/org/apache/camel/jsonpath/easypredicate/EasyPredicateOperators.java
b/components/camel-jsonpath/src/main/java/org/apache/camel/jsonpath/easypredicate/EasyPredicateOperators.java
index a121e82f2fda..220a165785ae 100644
---
a/components/camel-jsonpath/src/main/java/org/apache/camel/jsonpath/easypredicate/EasyPredicateOperators.java
+++
b/components/camel-jsonpath/src/main/java/org/apache/camel/jsonpath/easypredicate/EasyPredicateOperators.java
@@ -44,9 +44,6 @@ public final class EasyPredicateOperators {
private EasyPredicateOperators() {
}
- /**
- * Does the expression have any operator (with single space around)?
- */
/**
* Does the expression have any operator (with a single space around it on
each side)?
*
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 19d5432d9ccf..81f90cef2dc3 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
@@ -147,6 +147,14 @@ public class SimpleTokenizer {
return false;
}
+ /**
+ * Whether a {@code !} in front of a function negates it. Only a predicate
parser turns this on: in an expression a
+ * {@code !} is ordinary text, as in {@code Hello ${body}!}, and must
never become an operator (CAMEL-24984).
+ */
+ public void setNotOperator(boolean notOperator) {
+ this.notOperator = notOperator;
+ }
+
/**
* Create the next token
*
@@ -156,14 +164,6 @@ public class SimpleTokenizer {
* @param filter defines the accepted token types to be returned
(character is always used as fallback)
* @return the created token, will always return a token
*/
- /**
- * Whether a {@code !} in front of a function negates it. Only a predicate
parser turns this on: in an expression a
- * {@code !} is ordinary text, as in {@code Hello ${body}!}, and must
never become an operator (CAMEL-24984).
- */
- public void setNotOperator(boolean notOperator) {
- this.notOperator = notOperator;
- }
-
public SimpleToken nextToken(String expression, int index, boolean
allowEscape, TokenType... filter) {
return doNextToken(expression, index, allowEscape, filter);
}
diff --git
a/core/camel-java-io/src/main/java/org/apache/camel/java/in/JavaChainParser.java
b/core/camel-java-io/src/main/java/org/apache/camel/java/in/JavaChainParser.java
index 9950092f7b11..505c88acc911 100644
---
a/core/camel-java-io/src/main/java/org/apache/camel/java/in/JavaChainParser.java
+++
b/core/camel-java-io/src/main/java/org/apache/camel/java/in/JavaChainParser.java
@@ -220,10 +220,6 @@ final class JavaChainParser {
superclasses);
}
- /**
- * The token ranges of the bodies of {@code configure()} (a RouteBuilder)
and {@code configuration()} (a
- * RouteConfigurationBuilder), collecting the constants of the class on
the way.
- */
/** What a route builder is called with: the chains of its lambdas start
on their parameter. */
private static final Set<String> BUILDER_ENTRIES = Set.of(
"from", "fromF", "fromV", "rest", "restConfiguration",
"routeTemplate", "templatedRoute", "routeConfiguration",
@@ -240,6 +236,10 @@ final class JavaChainParser {
&& BUILDER_ENTRIES.contains(tokens.get(p + 2).text()) &&
tokens.get(p + 3).is("(");
}
+ /**
+ * The token ranges of the bodies of {@code configure()} (a RouteBuilder)
and {@code configuration()} (a
+ * RouteConfigurationBuilder), collecting the constants of the class on
the way.
+ */
private List<int[]> findMethodBodies(Map<String, Node> constants) {
List<int[]> bodies = new ArrayList<>();
int depth = 0;
diff --git
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/EndpointSchemaGeneratorMojo.java
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/EndpointSchemaGeneratorMojo.java
index e19e6fc17c86..d8ac3cff5f90 100644
---
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/EndpointSchemaGeneratorMojo.java
+++
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/EndpointSchemaGeneratorMojo.java
@@ -2060,12 +2060,6 @@ public class EndpointSchemaGeneratorMojo extends
AbstractGeneratorMojo {
return fieldTypeName;
}
- /**
- * Gets the default value accordingly to its type
- *
- * @param defaultValue the current default value
- * @param fieldTypeName the field type such as int, boolean, String etc
- */
/**
* An option declared as an {@link org.apache.camel.Expression} or {@link
org.apache.camel.Predicate} is evaluated
* for each message by definition, so it needs no annotation to say so
(CAMEL-24918). The option may still be
@@ -2079,6 +2073,12 @@ public class EndpointSchemaGeneratorMojo extends
AbstractGeneratorMojo {
return "org.apache.camel.Expression".equals(name) ||
"org.apache.camel.Predicate".equals(name);
}
+ /**
+ * Gets the default value accordingly to its type
+ *
+ * @param defaultValue the current default value
+ * @param fieldTypeName the field type such as int, boolean, String etc
+ */
static Object getDefaultValue(Object defaultValue, String fieldTypeName,
boolean isDuration) {
// special for boolean as it should not be literal
if ("boolean".equals(fieldTypeName)) {
