camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From lburgazz...@apache.org
Subject [1/2] camel git commit: CAMEL-10575: snakeyaml: add an option to filter classes the yaml parser can construct
Date Fri, 09 Dec 2016 16:17:54 GMT
Repository: camel
Updated Branches:
  refs/heads/camel-2.17.x 342b09e8e -> c98e48a74


http://git-wip-us.apache.org/repos/asf/camel/blob/c98e48a7/components/camel-snakeyaml/src/test/resources/org/apache/camel/component/snakeyaml/SnakeYAMLSpringMarshalTest.xml
----------------------------------------------------------------------
diff --git a/components/camel-snakeyaml/src/test/resources/org/apache/camel/component/snakeyaml/SnakeYAMLSpringMarshalTest.xml
b/components/camel-snakeyaml/src/test/resources/org/apache/camel/component/snakeyaml/SnakeYAMLSpringMarshalTest.xml
deleted file mode 100644
index 78210ff..0000000
--- a/components/camel-snakeyaml/src/test/resources/org/apache/camel/component/snakeyaml/SnakeYAMLSpringMarshalTest.xml
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ Licensed to the Apache Software Foundation (ASF) under one or more
-  ~ contributor license agreements.  See the NOTICE file distributed with
-  ~ this work for additional information regarding copyright ownership.
-  ~ The ASF licenses this file to You under the Apache License, Version 2.0
-  ~ (the "License"); you may not use this file except in compliance with
-  ~ the License.  You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
-<beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:schemaLocation="
-       http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
-       http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
-
-    <camelContext id="camel" xmlns="http://camel.apache.org/schema/spring">
-
-        <!-- we define the yaml SnakeYAML data formats to be used -->
-        <dataFormats>
-            <yaml id="yaml"
-                  library="SnakeYAML"/>
-
-            <yaml id="yaml-pojo"
-                  library="SnakeYAML"
-                  unmarshalTypeName="org.apache.camel.component.snakeyaml.model.TestPojo"/>
-
-            <yaml id="yaml-pojo-pretty-flow"
-                  library="SnakeYAML"
-                  unmarshalTypeName="org.apache.camel.component.snakeyaml.model.TestPojo"
-                  prettyFlow="true"/>
-        </dataFormats>
-
-
-        <route>
-            <from uri="direct:in"/>
-            <marshal ref="yaml"/>
-        </route>
-
-        <route>
-            <from uri="direct:back"/>
-            <unmarshal ref="yaml"/>
-            <to uri="mock:reverse"/>
-        </route>
-
-        <route>
-            <from uri="direct:inPojo"/>
-            <marshal ref="yaml-pojo"/>
-        </route>
-
-        <route>
-            <from uri="direct:backPojo"/>
-            <unmarshal ref="yaml-pojo"/>
-            <to uri="mock:reversePojo"/>
-        </route>
-
-        <route>
-            <from uri="direct:inPojoWithPrettyFlow"/>
-            <marshal ref="yaml-pojo-pretty-flow"/>
-        </route>
-
-        <route>
-            <from uri="direct:backPojoWithPrettyFlow"/>
-            <unmarshal ref="yaml-pojo-pretty-flow"/>
-            <to uri="mock:reversePojoWithPrettyFlow"/>
-        </route>
-
-    </camelContext>
-</beans>

http://git-wip-us.apache.org/repos/asf/camel/blob/c98e48a7/components/camel-snakeyaml/src/test/resources/org/apache/camel/component/snakeyaml/SnakeYAMLSpringTest.xml
----------------------------------------------------------------------
diff --git a/components/camel-snakeyaml/src/test/resources/org/apache/camel/component/snakeyaml/SnakeYAMLSpringTest.xml
b/components/camel-snakeyaml/src/test/resources/org/apache/camel/component/snakeyaml/SnakeYAMLSpringTest.xml
new file mode 100644
index 0000000..78210ff
--- /dev/null
+++ b/components/camel-snakeyaml/src/test/resources/org/apache/camel/component/snakeyaml/SnakeYAMLSpringTest.xml
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Licensed to the Apache Software Foundation (ASF) under one or more
+  ~ contributor license agreements.  See the NOTICE file distributed with
+  ~ this work for additional information regarding copyright ownership.
+  ~ The ASF licenses this file to You under the Apache License, Version 2.0
+  ~ (the "License"); you may not use this file except in compliance with
+  ~ the License.  You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="
+       http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+       http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
+
+    <camelContext id="camel" xmlns="http://camel.apache.org/schema/spring">
+
+        <!-- we define the yaml SnakeYAML data formats to be used -->
+        <dataFormats>
+            <yaml id="yaml"
+                  library="SnakeYAML"/>
+
+            <yaml id="yaml-pojo"
+                  library="SnakeYAML"
+                  unmarshalTypeName="org.apache.camel.component.snakeyaml.model.TestPojo"/>
+
+            <yaml id="yaml-pojo-pretty-flow"
+                  library="SnakeYAML"
+                  unmarshalTypeName="org.apache.camel.component.snakeyaml.model.TestPojo"
+                  prettyFlow="true"/>
+        </dataFormats>
+
+
+        <route>
+            <from uri="direct:in"/>
+            <marshal ref="yaml"/>
+        </route>
+
+        <route>
+            <from uri="direct:back"/>
+            <unmarshal ref="yaml"/>
+            <to uri="mock:reverse"/>
+        </route>
+
+        <route>
+            <from uri="direct:inPojo"/>
+            <marshal ref="yaml-pojo"/>
+        </route>
+
+        <route>
+            <from uri="direct:backPojo"/>
+            <unmarshal ref="yaml-pojo"/>
+            <to uri="mock:reversePojo"/>
+        </route>
+
+        <route>
+            <from uri="direct:inPojoWithPrettyFlow"/>
+            <marshal ref="yaml-pojo-pretty-flow"/>
+        </route>
+
+        <route>
+            <from uri="direct:backPojoWithPrettyFlow"/>
+            <unmarshal ref="yaml-pojo-pretty-flow"/>
+            <to uri="mock:reversePojoWithPrettyFlow"/>
+        </route>
+
+    </camelContext>
+</beans>

http://git-wip-us.apache.org/repos/asf/camel/blob/c98e48a7/components/camel-snakeyaml/src/test/resources/org/apache/camel/component/snakeyaml/SnakeYAMLSpringTypeFilterTest.xml
----------------------------------------------------------------------
diff --git a/components/camel-snakeyaml/src/test/resources/org/apache/camel/component/snakeyaml/SnakeYAMLSpringTypeFilterTest.xml
b/components/camel-snakeyaml/src/test/resources/org/apache/camel/component/snakeyaml/SnakeYAMLSpringTypeFilterTest.xml
new file mode 100644
index 0000000..80d5a05
--- /dev/null
+++ b/components/camel-snakeyaml/src/test/resources/org/apache/camel/component/snakeyaml/SnakeYAMLSpringTypeFilterTest.xml
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Licensed to the Apache Software Foundation (ASF) under one or more
+  ~ contributor license agreements.  See the NOTICE file distributed with
+  ~ this work for additional information regarding copyright ownership.
+  ~ The ASF licenses this file to You under the Apache License, Version 2.0
+  ~ (the "License"); you may not use this file except in compliance with
+  ~ the License.  You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="
+       http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+       http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
+
+    <camelContext id="camel" xmlns="http://camel.apache.org/schema/spring">
+
+        <!-- we define the yaml SnakeYAML data formats to be used -->
+        <dataFormats>
+            <yaml id="yaml-safe-constructor"/>
+
+            <yaml id="yaml-type-constructor" library="SnakeYAML">
+                <typeFilter value="org.apache.camel.component.snakeyaml.model.TestPojo"/>
+            </yaml>
+
+            <yaml id="yaml-type-constructor-strdef" library="SnakeYAML">
+                <typeFilter value="org.apache.camel.component.snakeyaml.model.TestPojo"/>
+                <typeFilter value="org.apache.camel.component.snakeyaml.model.Rex.*" type="regexp"/>
+            </yaml>
+
+            <yaml id="yaml-all-constructor" allowAnyType="true"/>
+        </dataFormats>
+
+
+        <route>
+            <from uri="direct:safe-constructor"/>
+            <unmarshal ref="yaml-safe-constructor"/>
+        </route>
+        <route>
+            <from uri="direct:type-constructor"/>
+            <unmarshal ref="yaml-type-constructor"/>
+        </route>
+        <route>
+            <from uri="direct:type-constructor-strdef"/>
+            <unmarshal ref="yaml-type-constructor-strdef"/>
+        </route>
+        <route>
+            <from uri="direct:all-constructor"/>
+            <unmarshal ref="yaml-all-constructor"/>
+        </route>
+    </camelContext>
+</beans>


Mime
View raw message