This is an automated email from the ASF dual-hosted git repository.
pcongiusti 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 aca2eb577c53 fix(tooling): suppress xml autogen warnings
aca2eb577c53 is described below
commit aca2eb577c5387ac53971119de3003f4d57ede1b
Author: Pasquale Congiusti <[email protected]>
AuthorDate: Thu Oct 16 09:23:19 2025 +0200
fix(tooling): suppress xml autogen warnings
Ref CAMEL-22549
---
core/camel-xml-io/pom.xml | 6 +++---
.../src/generated/java/org/apache/camel/xml/in/ModelParser.java | 9 +++++----
.../src/generated/java/org/apache/camel/xml/out/ModelWriter.java | 6 ++++--
.../generated/java/org/apache/camel/yaml/out/ModelWriter.java | 6 ++++--
.../src/main/resources/velocity/model-parser.vm | 9 +++++++--
.../src/main/resources/velocity/model-writer.vm | 6 ++++++
6 files changed, 29 insertions(+), 13 deletions(-)
diff --git a/core/camel-xml-io/pom.xml b/core/camel-xml-io/pom.xml
index 2c1caa639006..13256c61481c 100644
--- a/core/camel-xml-io/pom.xml
+++ b/core/camel-xml-io/pom.xml
@@ -153,7 +153,7 @@
<propertyregex property="ov.p2a"
input="${ov.p2}" regexp="(\..+)" replace="\1" defaultValue=".0" />
<property name="camel.schema.version"
value="${ov.p1a}${ov.p2a}" />
<mkdir dir="target" />
- <echo file="target/camel.osgi.version.txt">
+ <echo level="info"
file="target/camel.osgi.version.txt">
camel.schema.version =
${camel.schema.version}
</echo>
</target>
@@ -167,7 +167,7 @@
<phase>process-classes</phase>
<configuration>
<target>
- <echo>Copying code together for the XSD
generation</echo>
+ <echo level="info">Copying code together for
the XSD generation</echo>
<mkdir
dir="${project.build.directory}/schema-src" />
<copy
todir="${project.build.directory}/schema-src">
<fileset
dir="${project.basedir}/../camel-api/src/main/java">
@@ -202,7 +202,7 @@
<phase>prepare-package</phase>
<configuration>
<target>
- <echo>Updating namespace in XSD schema</echo>
+ <echo level="info">Updating namespace in XSD
schema</echo>
<replace
file="${project.build.directory}/classes/camel-xml-io.xsd"
token=""http://camel.apache.org/schema/spring""
value=""http://camel.apache.org/schema/xml-io""
preservelastmodified="true" />
<copy
file="${project.build.directory}/classes/camel-xml-io.xsd"
tofile="${project.build.directory}/classes/camel-xml-io-v${camel.schema.version}.xsd"
preservelastmodified="true" />
<replace
file="${project.build.directory}/classes/camel-xml-io-v${camel.schema.version}.xsd"
token=""http://camel.apache.org/schema/xml-io""
value=""http://camel.apache.org/schema/xml-io/v${camel.schema.version}""
preservelastmodified="true" />
diff --git
a/core/camel-xml-io/src/generated/java/org/apache/camel/xml/in/ModelParser.java
b/core/camel-xml-io/src/generated/java/org/apache/camel/xml/in/ModelParser.java
index 56fc2ae52714..fdf7c91d5162 100644
---
a/core/camel-xml-io/src/generated/java/org/apache/camel/xml/in/ModelParser.java
+++
b/core/camel-xml-io/src/generated/java/org/apache/camel/xml/in/ModelParser.java
@@ -23,15 +23,12 @@ package org.apache.camel.xml.in;
import java.io.IOException;
import java.io.InputStream;
import java.io.Reader;
-import java.lang.*;
import java.util.ArrayList;
import java.util.List;
import java.util.Optional;
import javax.annotation.processing.Generated;
import org.w3c.dom.Element;
-import java.lang.*;
-import org.apache.camel.*;
import org.apache.camel.model.*;
import org.apache.camel.model.app.*;
import org.apache.camel.model.cloud.*;
@@ -48,7 +45,11 @@ import org.apache.camel.spi.*;
import org.apache.camel.xml.io.XmlPullParserException;
@Generated("org.apache.camel.maven.packaging.ModelXmlParserGeneratorMojo")
-@SuppressWarnings("unused")
+// The model automatically scan all classes, also those one deprecated. They
will be dropped when removed from core model.
+// In the while we confirm this exception by suppressing the compiler warning.
+// It allows usage of raw types as it is an autogenerated class used
internally by the framework.
+// Same for unchecked type safety warnings.
+@SuppressWarnings({"deprecation","rawtypes","unchecked"})
public class ModelParser extends BaseParser {
public ModelParser(Resource input) throws IOException,
XmlPullParserException {
diff --git
a/core/camel-xml-io/src/generated/java/org/apache/camel/xml/out/ModelWriter.java
b/core/camel-xml-io/src/generated/java/org/apache/camel/xml/out/ModelWriter.java
index a270b5f4a95c..673169c54f39 100644
---
a/core/camel-xml-io/src/generated/java/org/apache/camel/xml/out/ModelWriter.java
+++
b/core/camel-xml-io/src/generated/java/org/apache/camel/xml/out/ModelWriter.java
@@ -26,8 +26,6 @@ import java.util.Base64;
import java.util.List;
import javax.annotation.processing.Generated;
-import java.lang.*;
-import org.apache.camel.*;
import org.apache.camel.model.*;
import org.apache.camel.model.app.*;
import org.apache.camel.model.cloud.*;
@@ -42,6 +40,10 @@ import org.apache.camel.model.transformer.*;
import org.apache.camel.model.validator.*;
@Generated("org.apache.camel.maven.packaging.XmlModelWriterGeneratorMojo")
+// The model automatically scan all classes, also those one deprecated. They
will be dropped when removed from core model.
+// In the while we confirm this exception by suppressing the compiler warning.
+// It allows usage of raw types as it is an autogenerated class used
internally by the framework.
+@SuppressWarnings({"deprecation","rawtypes"})
public class ModelWriter extends BaseWriter {
public ModelWriter(Writer writer, String namespace) throws IOException {
diff --git
a/core/camel-yaml-io/src/generated/java/org/apache/camel/yaml/out/ModelWriter.java
b/core/camel-yaml-io/src/generated/java/org/apache/camel/yaml/out/ModelWriter.java
index 9c5c5c3c231b..42320c045ca0 100644
---
a/core/camel-yaml-io/src/generated/java/org/apache/camel/yaml/out/ModelWriter.java
+++
b/core/camel-yaml-io/src/generated/java/org/apache/camel/yaml/out/ModelWriter.java
@@ -26,8 +26,6 @@ import java.util.Base64;
import java.util.List;
import javax.annotation.processing.Generated;
-import java.lang.*;
-import org.apache.camel.*;
import org.apache.camel.model.*;
import org.apache.camel.model.app.*;
import org.apache.camel.model.cloud.*;
@@ -42,6 +40,10 @@ import org.apache.camel.model.transformer.*;
import org.apache.camel.model.validator.*;
@Generated("org.apache.camel.maven.packaging.YamlModelWriterGeneratorMojo")
+// The model automatically scan all classes, also those one deprecated. They
will be dropped when removed from core model.
+// In the while we confirm this exception by suppressing the compiler warning.
+// It allows usage of raw types as it is an autogenerated class used
internally by the framework.
+@SuppressWarnings({"deprecation","rawtypes"})
public class ModelWriter extends BaseWriter {
public ModelWriter(Writer writer, String namespace) throws IOException {
diff --git
a/tooling/maven/camel-package-maven-plugin/src/main/resources/velocity/model-parser.vm
b/tooling/maven/camel-package-maven-plugin/src/main/resources/velocity/model-parser.vm
index 4a14c7702684..7180dac562c9 100644
---
a/tooling/maven/camel-package-maven-plugin/src/main/resources/velocity/model-parser.vm
+++
b/tooling/maven/camel-package-maven-plugin/src/main/resources/velocity/model-parser.vm
@@ -40,7 +40,6 @@ package ${package};
import java.io.IOException;
import java.io.InputStream;
import java.io.Reader;
-import java.lang.*;
import java.util.ArrayList;
import java.util.List;
import java.util.Optional;
@@ -52,12 +51,18 @@ import org.w3c.dom.Element;
#set( $foo = $pkgs.add($clazz.getPackageName()) )
#end
#foreach( $pkg in $pkgs )
+#if( $pkg != "java.lang" && $pkg != "org.apache.camel" )
import ${pkg}.*;
#end
+#end
import org.apache.camel.xml.io.XmlPullParserException;
@Generated("org.apache.camel.maven.packaging.ModelXmlParserGeneratorMojo")
-@SuppressWarnings("unused")
+// The model automatically scan all classes, also those one deprecated. They
will be dropped when removed from core model.
+// In the while we confirm this exception by suppressing the compiler warning.
+// It allows usage of raw types as it is an autogenerated class used
internally by the framework.
+// Same for unchecked type safety warnings.
+@SuppressWarnings({"deprecation","rawtypes","unchecked"})
public class ModelParser extends BaseParser {
public ModelParser(Resource input) throws IOException,
XmlPullParserException {
diff --git
a/tooling/maven/camel-package-maven-plugin/src/main/resources/velocity/model-writer.vm
b/tooling/maven/camel-package-maven-plugin/src/main/resources/velocity/model-writer.vm
index 6fc0ee99d325..4b15a7fce29a 100644
---
a/tooling/maven/camel-package-maven-plugin/src/main/resources/velocity/model-writer.vm
+++
b/tooling/maven/camel-package-maven-plugin/src/main/resources/velocity/model-writer.vm
@@ -49,10 +49,16 @@ import javax.annotation.processing.Generated;
#set( $foo = $pkgs.add($clazz.getPackageName()) )
#end
#foreach( $pkg in $pkgs )
+#if( $pkg != "java.lang" && $pkg != "org.apache.camel" )
import ${pkg}.*;
#end
+#end
@Generated("${mojoClassName}")
+// The model automatically scan all classes, also those one deprecated. They
will be dropped when removed from core model.
+// In the while we confirm this exception by suppressing the compiler warning.
+// It allows usage of raw types as it is an autogenerated class used
internally by the framework.
+@SuppressWarnings({"deprecation","rawtypes"})
public class ModelWriter extends BaseWriter {
public ModelWriter(Writer writer, String namespace) throws IOException {