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 4eeb1cff0f5ad93d131f397245c18d5165bbb7a2 Author: Claus Ibsen <[email protected]> AuthorDate: Mon Aug 18 16:15:04 2025 +0200 CAMEL-22354: dataformats - Align all data formats getter setters to model --- .../parquet/avro/ParquetAvroDataFormatConfigurer.java | 7 +++++++ .../dataformat/parquet/avro/ParquetAvroDataFormat.java | 15 +++++++++------ .../avro/ParquetAvroDataFormatUnmarshalLazyLoadTest.java | 8 ++++---- .../reifier/dataformat/ParquetAvroDataFormatReifier.java | 2 ++ 4 files changed, 22 insertions(+), 10 deletions(-) diff --git a/components/camel-parquet-avro/src/generated/java/org/apache/camel/dataformat/parquet/avro/ParquetAvroDataFormatConfigurer.java b/components/camel-parquet-avro/src/generated/java/org/apache/camel/dataformat/parquet/avro/ParquetAvroDataFormatConfigurer.java index 2dd4702fc9e..82e1aba39b6 100644 --- a/components/camel-parquet-avro/src/generated/java/org/apache/camel/dataformat/parquet/avro/ParquetAvroDataFormatConfigurer.java +++ b/components/camel-parquet-avro/src/generated/java/org/apache/camel/dataformat/parquet/avro/ParquetAvroDataFormatConfigurer.java @@ -22,6 +22,7 @@ public class ParquetAvroDataFormatConfigurer extends org.apache.camel.support.co private static final Map<String, Object> ALL_OPTIONS; static { Map<String, Object> map = new CaseInsensitiveMap(); + map.put("CompressionCodecName", org.apache.parquet.hadoop.metadata.CompressionCodecName.class); map.put("LazyLoad", boolean.class); map.put("UnmarshalType", java.lang.Class.class); ALL_OPTIONS = map; @@ -31,6 +32,8 @@ public class ParquetAvroDataFormatConfigurer extends org.apache.camel.support.co public boolean configure(CamelContext camelContext, Object obj, String name, Object value, boolean ignoreCase) { ParquetAvroDataFormat target = (ParquetAvroDataFormat) obj; switch (ignoreCase ? name.toLowerCase() : name) { + case "compressioncodecname": + case "compressionCodecName": target.setCompressionCodecName(property(camelContext, org.apache.parquet.hadoop.metadata.CompressionCodecName.class, value)); return true; case "lazyload": case "lazyLoad": target.setLazyLoad(property(camelContext, boolean.class, value)); return true; case "unmarshaltype": @@ -47,6 +50,8 @@ public class ParquetAvroDataFormatConfigurer extends org.apache.camel.support.co @Override public Class<?> getOptionType(String name, boolean ignoreCase) { switch (ignoreCase ? name.toLowerCase() : name) { + case "compressioncodecname": + case "compressionCodecName": return org.apache.parquet.hadoop.metadata.CompressionCodecName.class; case "lazyload": case "lazyLoad": return boolean.class; case "unmarshaltype": @@ -59,6 +64,8 @@ public class ParquetAvroDataFormatConfigurer extends org.apache.camel.support.co public Object getOptionValue(Object obj, String name, boolean ignoreCase) { ParquetAvroDataFormat target = (ParquetAvroDataFormat) obj; switch (ignoreCase ? name.toLowerCase() : name) { + case "compressioncodecname": + case "compressionCodecName": return target.getCompressionCodecName(); case "lazyload": case "lazyLoad": return target.isLazyLoad(); case "unmarshaltype": diff --git a/components/camel-parquet-avro/src/main/java/org/apache/camel/dataformat/parquet/avro/ParquetAvroDataFormat.java b/components/camel-parquet-avro/src/main/java/org/apache/camel/dataformat/parquet/avro/ParquetAvroDataFormat.java index 5844f39231d..b3f283b8dca 100644 --- a/components/camel-parquet-avro/src/main/java/org/apache/camel/dataformat/parquet/avro/ParquetAvroDataFormat.java +++ b/components/camel-parquet-avro/src/main/java/org/apache/camel/dataformat/parquet/avro/ParquetAvroDataFormat.java @@ -153,10 +153,6 @@ public class ParquetAvroDataFormat extends ServiceSupport implements DataFormat, // no-op } - public String getCompressionCodecName() { - return compressionCodecName.name(); - } - /** * Compression codec to use when marshalling. You can find the supported codecs at * https://github.com/apache/parquet-format/blob/master/Compression.md#codecs. Note that some codecs may require you @@ -166,6 +162,14 @@ public class ParquetAvroDataFormat extends ServiceSupport implements DataFormat, this.compressionCodecName = CompressionCodecName.valueOf(compressionCodecName); } + public void setCompressionCodecName(CompressionCodecName compressionCodecName) { + this.compressionCodecName = compressionCodecName; + } + + public String getCompressionCodecName() { + return compressionCodecName.name(); + } + public Class<?> getUnmarshalType() { return unmarshalType; } @@ -187,9 +191,8 @@ public class ParquetAvroDataFormat extends ServiceSupport implements DataFormat, /** * Sets whether the unmarshalling should produce an iterator of records or read all the records at once. */ - public ParquetAvroDataFormat setLazyLoad(boolean lazyLoad) { + public void setLazyLoad(boolean lazyLoad) { this.lazyLoad = lazyLoad; - return this; } } diff --git a/components/camel-parquet-avro/src/test/java/org/apache/camel/dataformat/parquet/avro/ParquetAvroDataFormatUnmarshalLazyLoadTest.java b/components/camel-parquet-avro/src/test/java/org/apache/camel/dataformat/parquet/avro/ParquetAvroDataFormatUnmarshalLazyLoadTest.java index f532745dabd..d5c552f4179 100644 --- a/components/camel-parquet-avro/src/test/java/org/apache/camel/dataformat/parquet/avro/ParquetAvroDataFormatUnmarshalLazyLoadTest.java +++ b/components/camel-parquet-avro/src/test/java/org/apache/camel/dataformat/parquet/avro/ParquetAvroDataFormatUnmarshalLazyLoadTest.java @@ -81,12 +81,12 @@ public class ParquetAvroDataFormatUnmarshalLazyLoadTest extends CamelTestSupport @Override public void configure() throws Exception { - ParquetAvroDataFormat format = new ParquetAvroDataFormat() - .setLazyLoad(true); + ParquetAvroDataFormat format = new ParquetAvroDataFormat(); + format.setLazyLoad(true); format.setUnmarshalType(Pojo.class); - ParquetAvroDataFormat formatNoUnmarshalType = new ParquetAvroDataFormat() - .setLazyLoad(true); + ParquetAvroDataFormat formatNoUnmarshalType = new ParquetAvroDataFormat(); + formatNoUnmarshalType.setLazyLoad(true); from("direct:start") .unmarshal(format) diff --git a/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/dataformat/ParquetAvroDataFormatReifier.java b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/dataformat/ParquetAvroDataFormatReifier.java index eda9b12661e..bf28013072d 100644 --- a/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/dataformat/ParquetAvroDataFormatReifier.java +++ b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/dataformat/ParquetAvroDataFormatReifier.java @@ -31,6 +31,8 @@ public class ParquetAvroDataFormatReifier extends DataFormatReifier<ParquetAvroD @Override protected void prepareDataFormatConfig(Map<String, Object> properties) { properties.put("unmarshalType", or(definition.getUnmarshalType(), definition.getUnmarshalTypeName())); + properties.put("lazyLoad", definition.getLazyLoad()); + properties.put("compressionCodecName", definition.getCompressionCodecName()); } }
