You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2025/08/19 11:37:04 UTC
(camel) 28/31: CAMEL-22354: dataformats - Align all data formats getter setters to model
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 2cd45eaf88b8ec49e288c2a93433fa4915b729e3
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Tue Aug 19 13:18:12 2025 +0200
CAMEL-22354: dataformats - Align all data formats getter setters to model
---
.../java/org/apache/camel/component/snakeyaml/SnakeYAMLDataFormat.java | 2 +-
.../apache/camel/component/snakeyaml/SnakeYAMLSpringTypeFilterTest.java | 2 --
.../org/apache/camel/component/snakeyaml/SnakeYAMLTypeFilterTest.java | 2 --
core/camel-util/src/main/java/org/apache/camel/util/SensitiveUtils.java | 2 +-
4 files changed, 2 insertions(+), 6 deletions(-)
diff --git a/components/camel-snakeyaml/src/main/java/org/apache/camel/component/snakeyaml/SnakeYAMLDataFormat.java b/components/camel-snakeyaml/src/main/java/org/apache/camel/component/snakeyaml/SnakeYAMLDataFormat.java
index 47dc06644c5..ff1f7edd5c8 100644
--- a/components/camel-snakeyaml/src/main/java/org/apache/camel/component/snakeyaml/SnakeYAMLDataFormat.java
+++ b/components/camel-snakeyaml/src/main/java/org/apache/camel/component/snakeyaml/SnakeYAMLDataFormat.java
@@ -142,7 +142,7 @@ public final class SnakeYAMLDataFormat extends ServiceSupport implements DataFor
}
}
if (allowAnyType) {
- typeFilters = null;
+ typeFilters = "*";
}
if (this.constructor == null) {
this.constructor = defaultConstructor(camelContext);
diff --git a/components/camel-snakeyaml/src/test/java/org/apache/camel/component/snakeyaml/SnakeYAMLSpringTypeFilterTest.java b/components/camel-snakeyaml/src/test/java/org/apache/camel/component/snakeyaml/SnakeYAMLSpringTypeFilterTest.java
index bd434a0baaf..1d594191c40 100644
--- a/components/camel-snakeyaml/src/test/java/org/apache/camel/component/snakeyaml/SnakeYAMLSpringTypeFilterTest.java
+++ b/components/camel-snakeyaml/src/test/java/org/apache/camel/component/snakeyaml/SnakeYAMLSpringTypeFilterTest.java
@@ -17,7 +17,6 @@
package org.apache.camel.component.snakeyaml;
import org.apache.camel.test.spring.junit5.CamelSpringTestSupport;
-import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import org.springframework.context.support.AbstractXmlApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
@@ -40,7 +39,6 @@ public class SnakeYAMLSpringTypeFilterTest extends CamelSpringTestSupport {
SnakeYAMLTypeFilterHelper.testTypeConstructorFromDefinition(template);
}
- @Disabled
@Test
public void testAllowAllConstructor() throws Exception {
SnakeYAMLTypeFilterHelper.testAllowAllConstructor(template);
diff --git a/components/camel-snakeyaml/src/test/java/org/apache/camel/component/snakeyaml/SnakeYAMLTypeFilterTest.java b/components/camel-snakeyaml/src/test/java/org/apache/camel/component/snakeyaml/SnakeYAMLTypeFilterTest.java
index da19aea4b6d..60e2d0c32dd 100644
--- a/components/camel-snakeyaml/src/test/java/org/apache/camel/component/snakeyaml/SnakeYAMLTypeFilterTest.java
+++ b/components/camel-snakeyaml/src/test/java/org/apache/camel/component/snakeyaml/SnakeYAMLTypeFilterTest.java
@@ -19,7 +19,6 @@ package org.apache.camel.component.snakeyaml;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.snakeyaml.model.TestPojo;
import org.apache.camel.test.junit5.CamelTestSupport;
-import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
public class SnakeYAMLTypeFilterTest extends CamelTestSupport {
@@ -39,7 +38,6 @@ public class SnakeYAMLTypeFilterTest extends CamelTestSupport {
}
@Test
- @Disabled
public void testAllowAllConstructor() throws Exception {
SnakeYAMLTypeFilterHelper.testAllowAllConstructor(template);
}
diff --git a/core/camel-util/src/main/java/org/apache/camel/util/SensitiveUtils.java b/core/camel-util/src/main/java/org/apache/camel/util/SensitiveUtils.java
index 6f2c4ade10b..54b8e1421ab 100644
--- a/core/camel-util/src/main/java/org/apache/camel/util/SensitiveUtils.java
+++ b/core/camel-util/src/main/java/org/apache/camel/util/SensitiveUtils.java
@@ -184,7 +184,7 @@ public final class SensitiveUtils {
+ "|\\Qverificationcode\\E"
+ "|\\Qwebhookverifytoken\\E"
+ "|\\Qzookeeperpassword\\E"
- // SENSITIVE-PATTERN: END
+ // SENSITIVE-PATTERN: END
;
private SensitiveUtils() {