This is an automated email from the ASF dual-hosted git repository. orpiske pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel.git
commit 37728599983f4253651575fa1ae621cb561897a5 Author: Otavio Rodolfo Piske <[email protected]> AuthorDate: Sat Mar 28 13:35:49 2026 +0000 (chores): fix SonarCloud S5993 in camel-core-model Change public constructors of abstract classes to protected. Claude Code on behalf of Otavio R. Piske Co-Authored-By: Claude Sonnet 4.6 <[email protected]> --- .../services/org/apache/camel/model.properties | 20 ++++++++++++++++++++ .../apache/camel/builder/AdviceWithRouteBuilder.java | 4 ++-- .../java/org/apache/camel/builder/RouteBuilder.java | 4 ++-- .../org/apache/camel/model/BasicExpressionNode.java | 8 ++++---- .../camel/model/BasicOutputExpressionNode.java | 10 +++++----- .../java/org/apache/camel/model/ExpressionNode.java | 8 ++++---- .../apache/camel/model/LoadBalancerDefinition.java | 2 +- .../org/apache/camel/model/OutputExpressionNode.java | 12 ++++++------ .../java/org/apache/camel/model/SendDefinition.java | 4 ++-- .../TransactionErrorHandlerDefinition.java | 4 ++-- .../camel/model/rest/RestSecurityDefinition.java | 4 ++-- .../model/transformer/TransformerDefinition.java | 2 +- .../camel/model/validator/ValidatorDefinition.java | 2 +- 13 files changed, 52 insertions(+), 32 deletions(-) diff --git a/core/camel-core-model/src/generated/resources/META-INF/services/org/apache/camel/model.properties b/core/camel-core-model/src/generated/resources/META-INF/services/org/apache/camel/model.properties index bd8dde1e716f..1b1704a1b0bd 100644 --- a/core/camel-core-model/src/generated/resources/META-INF/services/org/apache/camel/model.properties +++ b/core/camel-core-model/src/generated/resources/META-INF/services/org/apache/camel/model.properties @@ -12,11 +12,16 @@ beanFactory beanio bearerToken bindy +blacklistServiceFilter +cachingServiceDiscovery cbor choice circuitBreaker claimCheck +combinedServiceDiscovery +combinedServiceFilter constant +consulServiceDiscovery contextScan convertBodyTo convertHeaderTo @@ -26,6 +31,7 @@ csimple csv custom customLoadBalancer +customServiceFilter customTransformer customValidator dataFormatTransformer @@ -33,9 +39,11 @@ dataFormats datasonnet deadLetterChannel defaultErrorHandler +defaultLoadBalancer delay delete dfdl +dnsServiceDiscovery doCatch doFinally doTry @@ -64,6 +72,7 @@ groovyXml gzipDeflater head header +healthyServiceFilter hl7 hl7terser ical @@ -84,6 +93,7 @@ jsonApi jsonpath jtaTransactionErrorHandler kamelet +kubernetesServiceDiscovery langChain4jCharacterTokenizer langChain4jLineTokenizer langChain4jParagraphTokenizer @@ -91,6 +101,7 @@ langChain4jSentenceTokenizer langChain4jWordTokenizer language loadBalance +loadBalancerConfiguration loadTransformer log loop @@ -117,6 +128,7 @@ outputType packageScan param parquetAvro +passThroughServiceFilter patch pausable pgp @@ -173,6 +185,12 @@ sample script security securityDefinitions +serviceCall +serviceCallConfiguration +serviceChooserConfiguration +serviceDiscoveryConfiguration +serviceExpression +serviceFilterConfiguration setBody setExchangePattern setHeader @@ -187,6 +205,7 @@ sort spel split springTransactionErrorHandler +staticServiceDiscovery step stickyLoadBalancer stop @@ -233,3 +252,4 @@ xtokenize yaml zipDeflater zipFile +zookeeperServiceDiscovery diff --git a/core/camel-core-model/src/main/java/org/apache/camel/builder/AdviceWithRouteBuilder.java b/core/camel-core-model/src/main/java/org/apache/camel/builder/AdviceWithRouteBuilder.java index 62c3f405c716..e15f015a5946 100644 --- a/core/camel-core-model/src/main/java/org/apache/camel/builder/AdviceWithRouteBuilder.java +++ b/core/camel-core-model/src/main/java/org/apache/camel/builder/AdviceWithRouteBuilder.java @@ -43,10 +43,10 @@ public abstract class AdviceWithRouteBuilder extends RouteBuilder { private final List<AdviceWithTask> adviceWithTasks = new ArrayList<>(); private boolean logRouteAsXml = true; - public AdviceWithRouteBuilder() { + protected AdviceWithRouteBuilder() { } - public AdviceWithRouteBuilder(CamelContext context) { + protected AdviceWithRouteBuilder(CamelContext context) { super(context); } diff --git a/core/camel-core-model/src/main/java/org/apache/camel/builder/RouteBuilder.java b/core/camel-core-model/src/main/java/org/apache/camel/builder/RouteBuilder.java index 52c8105ab391..2f74dd05e06b 100644 --- a/core/camel-core-model/src/main/java/org/apache/camel/builder/RouteBuilder.java +++ b/core/camel-core-model/src/main/java/org/apache/camel/builder/RouteBuilder.java @@ -90,11 +90,11 @@ public abstract class RouteBuilder extends BuilderSupport implements RoutesBuild private RouteTemplatesDefinition routeTemplateCollection = new RouteTemplatesDefinition(); private TemplatedRoutesDefinition templatedRouteCollection = new TemplatedRoutesDefinition(); - public RouteBuilder() { + protected RouteBuilder() { this(null); } - public RouteBuilder(CamelContext context) { + protected RouteBuilder(CamelContext context) { super(context); } diff --git a/core/camel-core-model/src/main/java/org/apache/camel/model/BasicExpressionNode.java b/core/camel-core-model/src/main/java/org/apache/camel/model/BasicExpressionNode.java index d0b80fd718f0..abb6ca8df138 100644 --- a/core/camel-core-model/src/main/java/org/apache/camel/model/BasicExpressionNode.java +++ b/core/camel-core-model/src/main/java/org/apache/camel/model/BasicExpressionNode.java @@ -37,18 +37,18 @@ public abstract class BasicExpressionNode<T extends BasicExpressionNode<T>> exte @XmlElementRef private ExpressionDefinition expression; - public BasicExpressionNode() { + protected BasicExpressionNode() { } - public BasicExpressionNode(ExpressionDefinition expression) { + protected BasicExpressionNode(ExpressionDefinition expression) { setExpression(expression); } - public BasicExpressionNode(Expression expression) { + protected BasicExpressionNode(Expression expression) { setExpression(expression); } - public BasicExpressionNode(Predicate predicate) { + protected BasicExpressionNode(Predicate predicate) { setPredicate(predicate); } diff --git a/core/camel-core-model/src/main/java/org/apache/camel/model/BasicOutputExpressionNode.java b/core/camel-core-model/src/main/java/org/apache/camel/model/BasicOutputExpressionNode.java index 469905347bd0..33dad025217f 100644 --- a/core/camel-core-model/src/main/java/org/apache/camel/model/BasicOutputExpressionNode.java +++ b/core/camel-core-model/src/main/java/org/apache/camel/model/BasicOutputExpressionNode.java @@ -42,23 +42,23 @@ public abstract class BasicOutputExpressionNode extends BasicExpressionNode<Basi @XmlElementRef private List<ProcessorDefinition<?>> outputs = new ArrayList<>(); - public BasicOutputExpressionNode() { + protected BasicOutputExpressionNode() { } - public BasicOutputExpressionNode(BasicOutputExpressionNode source) { + protected BasicOutputExpressionNode(BasicOutputExpressionNode source) { super(source); this.outputs = ProcessorDefinitionHelper.deepCopyDefinitions(source.outputs); } - public BasicOutputExpressionNode(ExpressionDefinition expression) { + protected BasicOutputExpressionNode(ExpressionDefinition expression) { super(expression); } - public BasicOutputExpressionNode(Expression expression) { + protected BasicOutputExpressionNode(Expression expression) { super(expression); } - public BasicOutputExpressionNode(Predicate predicate) { + protected BasicOutputExpressionNode(Predicate predicate) { super(predicate); } diff --git a/core/camel-core-model/src/main/java/org/apache/camel/model/ExpressionNode.java b/core/camel-core-model/src/main/java/org/apache/camel/model/ExpressionNode.java index 6336cd6e4492..bc87ac417bc4 100644 --- a/core/camel-core-model/src/main/java/org/apache/camel/model/ExpressionNode.java +++ b/core/camel-core-model/src/main/java/org/apache/camel/model/ExpressionNode.java @@ -44,18 +44,18 @@ public abstract class ExpressionNode extends ProcessorDefinition<ExpressionNode> @XmlElementRef private ExpressionDefinition expression; - public ExpressionNode() { + protected ExpressionNode() { } - public ExpressionNode(ExpressionDefinition expression) { + protected ExpressionNode(ExpressionDefinition expression) { setExpression(expression); } - public ExpressionNode(Expression expression) { + protected ExpressionNode(Expression expression) { setExpression(expression); } - public ExpressionNode(Predicate predicate) { + protected ExpressionNode(Predicate predicate) { setPredicate(predicate); } diff --git a/core/camel-core-model/src/main/java/org/apache/camel/model/LoadBalancerDefinition.java b/core/camel-core-model/src/main/java/org/apache/camel/model/LoadBalancerDefinition.java index 4fb0616b22b4..8f4310dd7650 100644 --- a/core/camel-core-model/src/main/java/org/apache/camel/model/LoadBalancerDefinition.java +++ b/core/camel-core-model/src/main/java/org/apache/camel/model/LoadBalancerDefinition.java @@ -26,7 +26,7 @@ public abstract class LoadBalancerDefinition extends IdentifiedType implements C @XmlTransient private String loadBalancerTypeName; - public LoadBalancerDefinition() { + protected LoadBalancerDefinition() { } protected LoadBalancerDefinition(LoadBalancerDefinition source) { diff --git a/core/camel-core-model/src/main/java/org/apache/camel/model/OutputExpressionNode.java b/core/camel-core-model/src/main/java/org/apache/camel/model/OutputExpressionNode.java index fde1d015df5d..f03fbcd69efb 100644 --- a/core/camel-core-model/src/main/java/org/apache/camel/model/OutputExpressionNode.java +++ b/core/camel-core-model/src/main/java/org/apache/camel/model/OutputExpressionNode.java @@ -38,27 +38,27 @@ public abstract class OutputExpressionNode extends ExpressionNode implements Out @XmlElementRef private List<ProcessorDefinition<?>> outputs = new ArrayList<>(); - public OutputExpressionNode() { + protected OutputExpressionNode() { } - public OutputExpressionNode(OutputExpressionNode source) { + protected OutputExpressionNode(OutputExpressionNode source) { super(source); this.outputs = ProcessorDefinitionHelper.deepCopyDefinitions(source.outputs); } - public OutputExpressionNode(ExpressionNode source) { + protected OutputExpressionNode(ExpressionNode source) { super(source); } - public OutputExpressionNode(ExpressionDefinition expression) { + protected OutputExpressionNode(ExpressionDefinition expression) { super(expression); } - public OutputExpressionNode(Expression expression) { + protected OutputExpressionNode(Expression expression) { super(expression); } - public OutputExpressionNode(Predicate predicate) { + protected OutputExpressionNode(Predicate predicate) { super(predicate); } diff --git a/core/camel-core-model/src/main/java/org/apache/camel/model/SendDefinition.java b/core/camel-core-model/src/main/java/org/apache/camel/model/SendDefinition.java index 10a868b7526b..2e9b04ac2330 100644 --- a/core/camel-core-model/src/main/java/org/apache/camel/model/SendDefinition.java +++ b/core/camel-core-model/src/main/java/org/apache/camel/model/SendDefinition.java @@ -44,10 +44,10 @@ public abstract class SendDefinition<Type extends ProcessorDefinition<Type>> ext @Metadata(required = true) protected String uri; - public SendDefinition() { + protected SendDefinition() { } - public SendDefinition(String uri) { + protected SendDefinition(String uri) { this.uri = uri; } diff --git a/core/camel-core-model/src/main/java/org/apache/camel/model/errorhandler/TransactionErrorHandlerDefinition.java b/core/camel-core-model/src/main/java/org/apache/camel/model/errorhandler/TransactionErrorHandlerDefinition.java index 03799a3f1372..08d0d8fd4a7e 100644 --- a/core/camel-core-model/src/main/java/org/apache/camel/model/errorhandler/TransactionErrorHandlerDefinition.java +++ b/core/camel-core-model/src/main/java/org/apache/camel/model/errorhandler/TransactionErrorHandlerDefinition.java @@ -37,10 +37,10 @@ public abstract class TransactionErrorHandlerDefinition extends DefaultErrorHand @Metadata(javaType = "org.apache.camel.LoggingLevel", defaultValue = "WARN", enums = "TRACE,DEBUG,INFO,WARN,ERROR,OFF") private String rollbackLoggingLevel; - public TransactionErrorHandlerDefinition() { + protected TransactionErrorHandlerDefinition() { } - public TransactionErrorHandlerDefinition(TransactionErrorHandlerDefinition source) { + protected TransactionErrorHandlerDefinition(TransactionErrorHandlerDefinition source) { super(source); this.transactedPolicy = source.transactedPolicy; this.transactedPolicyRef = source.transactedPolicyRef; diff --git a/core/camel-core-model/src/main/java/org/apache/camel/model/rest/RestSecurityDefinition.java b/core/camel-core-model/src/main/java/org/apache/camel/model/rest/RestSecurityDefinition.java index 7a594b22962a..78b42c2ae3fb 100644 --- a/core/camel-core-model/src/main/java/org/apache/camel/model/rest/RestSecurityDefinition.java +++ b/core/camel-core-model/src/main/java/org/apache/camel/model/rest/RestSecurityDefinition.java @@ -38,10 +38,10 @@ public abstract class RestSecurityDefinition { @XmlAttribute private String description; - public RestSecurityDefinition() { + protected RestSecurityDefinition() { } - public RestSecurityDefinition(RestDefinition rest) { + protected RestSecurityDefinition(RestDefinition rest) { this.rest = rest; } diff --git a/core/camel-core-model/src/main/java/org/apache/camel/model/transformer/TransformerDefinition.java b/core/camel-core-model/src/main/java/org/apache/camel/model/transformer/TransformerDefinition.java index 9f84b07a29be..3dd5a60e7ab8 100644 --- a/core/camel-core-model/src/main/java/org/apache/camel/model/transformer/TransformerDefinition.java +++ b/core/camel-core-model/src/main/java/org/apache/camel/model/transformer/TransformerDefinition.java @@ -55,7 +55,7 @@ public abstract class TransformerDefinition implements CopyableDefinition<Transf @XmlAttribute private String toType; - public TransformerDefinition() { + protected TransformerDefinition() { } protected TransformerDefinition(TransformerDefinition source) { diff --git a/core/camel-core-model/src/main/java/org/apache/camel/model/validator/ValidatorDefinition.java b/core/camel-core-model/src/main/java/org/apache/camel/model/validator/ValidatorDefinition.java index 6b050cee1626..437cc22a550b 100644 --- a/core/camel-core-model/src/main/java/org/apache/camel/model/validator/ValidatorDefinition.java +++ b/core/camel-core-model/src/main/java/org/apache/camel/model/validator/ValidatorDefinition.java @@ -44,7 +44,7 @@ public abstract class ValidatorDefinition implements CopyableDefinition<Validato return type; } - public ValidatorDefinition() { + protected ValidatorDefinition() { } protected ValidatorDefinition(ValidatorDefinition source) {
