You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ac...@apache.org on 2020/03/24 11:31:16 UTC
[camel] 02/02: Camel-Snakeyaml: Removed refs to
camel-test-blueprint (camel-karaf migration)
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 2f5ffd2e4d86541360e5b2e4a26f143fead6f20a
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Tue Mar 24 12:30:48 2020 +0100
Camel-Snakeyaml: Removed refs to camel-test-blueprint (camel-karaf migration)
---
components/camel-snakeyaml/pom.xml | 5 --
.../SnakeYAMLBlueprintTypeFilterTest.java | 47 --------------
.../OSGI-INF/blueprint/blueprint-typefilter.xml | 73 ----------------------
3 files changed, 125 deletions(-)
diff --git a/components/camel-snakeyaml/pom.xml b/components/camel-snakeyaml/pom.xml
index f5f4eb5..e4030fb 100644
--- a/components/camel-snakeyaml/pom.xml
+++ b/components/camel-snakeyaml/pom.xml
@@ -48,11 +48,6 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-test-blueprint</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-api</artifactId>
<scope>test</scope>
diff --git a/components/camel-snakeyaml/src/test/java/org/apache/camel/component/snakeyaml/SnakeYAMLBlueprintTypeFilterTest.java b/components/camel-snakeyaml/src/test/java/org/apache/camel/component/snakeyaml/SnakeYAMLBlueprintTypeFilterTest.java
deleted file mode 100644
index 3c6ed43..0000000
--- a/components/camel-snakeyaml/src/test/java/org/apache/camel/component/snakeyaml/SnakeYAMLBlueprintTypeFilterTest.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * 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.
- */
-package org.apache.camel.component.snakeyaml;
-
-import org.apache.camel.test.blueprint.CamelBlueprintTestSupport;
-import org.junit.Test;
-
-public class SnakeYAMLBlueprintTypeFilterTest extends CamelBlueprintTestSupport {
- @Test
- public void testSafeConstructor() throws Exception {
- SnakeYAMLTypeFilterHelper.testSafeConstructor(template);
- }
-
- @Test
- public void testTypeConstructor() throws Exception {
- SnakeYAMLTypeFilterHelper.testTypeConstructor(template);
- }
-
- @Test
- public void testTypeConstructorFromDefinition() throws Exception {
- SnakeYAMLTypeFilterHelper.testTypeConstructorFromDefinition(template);
- }
-
- @Test
- public void testAllowAllConstructor() throws Exception {
- SnakeYAMLTypeFilterHelper.testAllowAllConstructor(template);
- }
-
- @Override
- protected String getBlueprintDescriptor() {
- return "OSGI-INF/blueprint/blueprint-typefilter.xml";
- }
-}
diff --git a/components/camel-snakeyaml/src/test/resources/OSGI-INF/blueprint/blueprint-typefilter.xml b/components/camel-snakeyaml/src/test/resources/OSGI-INF/blueprint/blueprint-typefilter.xml
deleted file mode 100644
index f5c97c5..0000000
--- a/components/camel-snakeyaml/src/test/resources/OSGI-INF/blueprint/blueprint-typefilter.xml
+++ /dev/null
@@ -1,73 +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.
-
--->
-<blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0">
-
- <!-- ******************** -->
- <!-- DataFormat -->
- <!-- ******************** -->
-
- <bean id="yaml-safe-constructor" class="org.apache.camel.component.snakeyaml.SnakeYAMLDataFormat"/>
-
- <bean id="yaml-type-constructor" class="org.apache.camel.component.snakeyaml.SnakeYAMLDataFormat">
- <property name="typeFilterDefinitions">
- <list>
- <value>type:org.apache.camel.component.snakeyaml.model.TestPojo</value>
- </list>
- </property>
- </bean>
-
- <bean id="yaml-type-constructor-strdef" class="org.apache.camel.component.snakeyaml.SnakeYAMLDataFormat">
- <property name="typeFilterDefinitions">
- <list>
- <value>type:org.apache.camel.component.snakeyaml.model.TestPojo</value>
- <value>regexp:org.apache.camel.component.snakeyaml.model.Rex.*</value>
- </list>
- </property>
- </bean>
-
- <bean id="yaml-all-constructor" class="org.apache.camel.component.snakeyaml.SnakeYAMLDataFormat">
- <property name="allowAnyType" value="true"/>
- </bean>
-
- <!-- ******************** -->
- <!-- Camel Context -->
- <!-- ******************** -->
-
- <camelContext id="camel" xmlns="http://camel.apache.org/schema/blueprint">
- <route>
- <from uri="direct:safe-constructor"/>
- <unmarshal><custom ref="yaml-safe-constructor"/></unmarshal>
- </route>
- <route>
- <from uri="direct:type-constructor"/>
- <unmarshal><custom ref="yaml-type-constructor"/></unmarshal>
- </route>
- <route>
- <from uri="direct:type-constructor-strdef"/>
- <unmarshal><custom ref="yaml-type-constructor-strdef"/></unmarshal>
- </route>
- <route>
- <from uri="direct:all-constructor"/>
- <unmarshal><custom ref="yaml-all-constructor"/></unmarshal>
- </route>
-
- </camelContext>
-
-</blueprint>