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 e63d6e51c402868f692d7469810130f03a776fc9 Author: Claus Ibsen <[email protected]> AuthorDate: Tue Aug 19 13:29:01 2025 +0200 CAMEL-22354: dataformats - Align all data formats getter setters to model --- .../component/snakeyaml/SnakeYAMLDataFormat.java | 33 +--------------------- .../camel/component/snakeyaml/SnakeYAMLTest.java | 7 ----- .../component/snakeyaml/SnakeYAMLTestHelper.java | 8 ------ 3 files changed, 1 insertion(+), 47 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 ff1f7edd5c8..7d50f7efdfc 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 @@ -25,9 +25,6 @@ import java.lang.ref.WeakReference; import java.util.Arrays; import java.util.Collection; import java.util.List; -import java.util.Map; -import java.util.concurrent.ConcurrentHashMap; -import java.util.concurrent.ConcurrentMap; import java.util.concurrent.CopyOnWriteArrayList; import org.apache.camel.CamelContext; @@ -67,7 +64,6 @@ public final class SnakeYAMLDataFormat extends ServiceSupport implements DataFor private String unmarshalTypeName; private Class<?> unmarshalType; private List<TypeDescription> typeDescriptions; - private ConcurrentMap<Class<?>, Tag> classTags; private boolean useApplicationContextClassLoader = true; private boolean prettyFlow; private boolean allowAnyType; @@ -268,22 +264,6 @@ public final class SnakeYAMLDataFormat extends ServiceSupport implements DataFor this.typeDescriptions.add(new TypeDescription(type, tag)); } - public Map<Class<?>, Tag> getClassTags() { - return classTags; - } - - public void setClassTags(Map<Class<?>, Tag> classTags) { - this.classTags = new ConcurrentHashMap<>(); - this.classTags.putAll(classTags); - } - - public void addClassTags(Class<?> type, Tag tag) { - if (this.classTags == null) { - this.classTags = new ConcurrentHashMap<>(); - } - this.classTags.put(type, tag); - } - public boolean isUseApplicationContextClassLoader() { return useApplicationContextClassLoader; } @@ -300,11 +280,6 @@ public final class SnakeYAMLDataFormat extends ServiceSupport implements DataFor this.prettyFlow = prettyFlow; } - public void addTag(Class<?> type, Tag tag) { - addClassTags(type, tag); - addTypeDescription(type, tag); - } - public boolean isAllowAnyType() { return allowAnyType; } @@ -361,13 +336,7 @@ public final class SnakeYAMLDataFormat extends ServiceSupport implements DataFor } private Representer defaultRepresenter() { - Representer yamlRepresenter = new Representer(new DumperOptions()); - if (classTags != null) { - for (Map.Entry<Class<?>, Tag> entry : classTags.entrySet()) { - yamlRepresenter.addClassTag(entry.getKey(), entry.getValue()); - } - } - return yamlRepresenter; + return new Representer(new DumperOptions()); } private DumperOptions defaultDumperOptions() { diff --git a/components/camel-snakeyaml/src/test/java/org/apache/camel/component/snakeyaml/SnakeYAMLTest.java b/components/camel-snakeyaml/src/test/java/org/apache/camel/component/snakeyaml/SnakeYAMLTest.java index 104e02764e3..603fd73ce02 100644 --- a/components/camel-snakeyaml/src/test/java/org/apache/camel/component/snakeyaml/SnakeYAMLTest.java +++ b/components/camel-snakeyaml/src/test/java/org/apache/camel/component/snakeyaml/SnakeYAMLTest.java @@ -26,9 +26,7 @@ import org.apache.camel.test.junit5.params.Parameter; import org.apache.camel.test.junit5.params.Parameterized; import org.apache.camel.test.junit5.params.Parameters; import org.apache.camel.test.junit5.params.Test; -import org.yaml.snakeyaml.nodes.Tag; -import static org.apache.camel.component.snakeyaml.SnakeYAMLTestHelper.createClassTagDataFormat; import static org.apache.camel.component.snakeyaml.SnakeYAMLTestHelper.createDataFormat; import static org.apache.camel.component.snakeyaml.SnakeYAMLTestHelper.createPrettyFlowDataFormat; import static org.apache.camel.component.snakeyaml.SnakeYAMLTestHelper.createTestMap; @@ -61,11 +59,6 @@ public class SnakeYAMLTest extends CamelTestSupport { createPrettyFlowDataFormat(TestPojo.class, true), createTestPojo(), "!!org.apache.camel.component.snakeyaml.model.TestPojo {\n name: Camel\n}" - }, - { - createClassTagDataFormat(TestPojo.class, new Tag("!tpojo")), - createTestPojo(), - "!tpojo {name: Camel}" } }); } diff --git a/components/camel-snakeyaml/src/test/java/org/apache/camel/component/snakeyaml/SnakeYAMLTestHelper.java b/components/camel-snakeyaml/src/test/java/org/apache/camel/component/snakeyaml/SnakeYAMLTestHelper.java index 20eef95edff..68cb460cd8f 100644 --- a/components/camel-snakeyaml/src/test/java/org/apache/camel/component/snakeyaml/SnakeYAMLTestHelper.java +++ b/components/camel-snakeyaml/src/test/java/org/apache/camel/component/snakeyaml/SnakeYAMLTestHelper.java @@ -23,7 +23,6 @@ import org.apache.camel.CamelContext; import org.apache.camel.ProducerTemplate; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.component.snakeyaml.model.TestPojo; -import org.yaml.snakeyaml.nodes.Tag; import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -61,13 +60,6 @@ public final class SnakeYAMLTestHelper { return format; } - public static SnakeYAMLDataFormat createClassTagDataFormat(Class<?> type, Tag tag) { - SnakeYAMLDataFormat format = createDataFormat(type); - format.addTag(type, tag); - - return format; - } - public static void marshalAndUnmarshal( CamelContext context, Object body, String mockName, String directIn, String directBack, String expected) throws Exception {
