This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch df2 in repository https://gitbox.apache.org/repos/asf/camel.git
commit ad2f867b0d1806a6a3c0eb7783593da09720aa7b Author: Claus Ibsen <[email protected]> AuthorDate: Tue Aug 19 13:08:02 2025 +0200 CAMEL-22354: dataformats - Align all data formats getter setters to model --- .../JacksonProtobufDataFormatConfigurer.java | 30 ++-------------------- .../protobuf/JacksonProtobufDataFormat.java | 6 ++--- .../maven/packaging/PackageDataFormatMojo.java | 3 +++ 3 files changed, 8 insertions(+), 31 deletions(-) diff --git a/components/camel-jackson-protobuf/src/generated/java/org/apache/camel/component/jackson/protobuf/JacksonProtobufDataFormatConfigurer.java b/components/camel-jackson-protobuf/src/generated/java/org/apache/camel/component/jackson/protobuf/JacksonProtobufDataFormatConfigurer.java index d31b340aa5f..7d20a250ad2 100644 --- a/components/camel-jackson-protobuf/src/generated/java/org/apache/camel/component/jackson/protobuf/JacksonProtobufDataFormatConfigurer.java +++ b/components/camel-jackson-protobuf/src/generated/java/org/apache/camel/component/jackson/protobuf/JacksonProtobufDataFormatConfigurer.java @@ -10,39 +10,13 @@ import org.apache.camel.spi.PropertyConfigurerGetter; import org.apache.camel.spi.ConfigurerStrategy; import org.apache.camel.spi.GeneratedPropertyConfigurer; import org.apache.camel.util.CaseInsensitiveMap; -import org.apache.camel.support.component.PropertyConfigurerSupport; +import org.apache.camel.component.jackson.JacksonDataFormatConfigurer; /** * Generated by camel build tools - do NOT edit this file! */ @Generated("org.apache.camel.maven.packaging.PackageDataFormatMojo") @SuppressWarnings("unchecked") -public class JacksonProtobufDataFormatConfigurer extends org.apache.camel.support.component.PropertyConfigurerSupport implements GeneratedPropertyConfigurer, ExtendedPropertyConfigurerGetter { - - private static final Map<String, Object> ALL_OPTIONS; - static { - Map<String, Object> map = new CaseInsensitiveMap(); - ALL_OPTIONS = map; - } - - @Override - public boolean configure(CamelContext camelContext, Object obj, String name, Object value, boolean ignoreCase) { - return false; - } - - @Override - public Map<String, Object> getAllOptions(Object target) { - return ALL_OPTIONS; - } - - @Override - public Class<?> getOptionType(String name, boolean ignoreCase) { - return null; - } - - @Override - public Object getOptionValue(Object obj, String name, boolean ignoreCase) { - return null; - } +public class JacksonProtobufDataFormatConfigurer extends org.apache.camel.component.jackson.JacksonDataFormatConfigurer implements GeneratedPropertyConfigurer, ExtendedPropertyConfigurerGetter { } diff --git a/components/camel-jackson-protobuf/src/main/java/org/apache/camel/component/jackson/protobuf/JacksonProtobufDataFormat.java b/components/camel-jackson-protobuf/src/main/java/org/apache/camel/component/jackson/protobuf/JacksonProtobufDataFormat.java index 554c9082aa8..c44b5ee97da 100644 --- a/components/camel-jackson-protobuf/src/main/java/org/apache/camel/component/jackson/protobuf/JacksonProtobufDataFormat.java +++ b/components/camel-jackson-protobuf/src/main/java/org/apache/camel/component/jackson/protobuf/JacksonProtobufDataFormat.java @@ -18,7 +18,7 @@ package org.apache.camel.component.jackson.protobuf; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.dataformat.protobuf.ProtobufMapper; -import org.apache.camel.component.jackson.AbstractJacksonDataFormat; +import org.apache.camel.component.jackson.JacksonDataFormat; import org.apache.camel.spi.Metadata; import org.apache.camel.spi.annotations.Dataformat; @@ -27,8 +27,8 @@ import org.apache.camel.spi.annotations.Dataformat; */ @Dataformat("protobufJackson") @Metadata(firstVersion = "3.10.0", title = "Protobuf Jackson", - excludeProperties = "library,instanceClass,contentTypeFormat,defaultInstance") -public class JacksonProtobufDataFormat extends AbstractJacksonDataFormat { + excludeProperties = "library,permissions,dateFormatPattern,instanceClass,contentTypeFormat,defaultInstance") +public class JacksonProtobufDataFormat extends JacksonDataFormat { /** * Use the default Jackson {@link ProtobufMapper} and {@link Object} diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageDataFormatMojo.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageDataFormatMojo.java index d8d5f7fded6..3fbf4aead9c 100644 --- a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageDataFormatMojo.java +++ b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageDataFormatMojo.java @@ -231,6 +231,9 @@ public class PackageDataFormatMojo extends AbstractGeneratorMojo { if ("soap".equals(name)) { hasSuper = true; pfqn = "org.apache.camel.converter.jaxb.JaxbDataFormatConfigurer"; + } else if ("protobufJackson".equals(name)) { + hasSuper = true; + pfqn = "org.apache.camel.component.jackson.JacksonDataFormatConfigurer"; } String cn = javaType.substring(javaType.lastIndexOf('.') + 1);
