This is an automated email from the ASF dual-hosted git repository. orpiske pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-k-runtime.git
commit 724d49338020f520c992672721290d61b6176bf7 Author: Otavio Rodolfo Piske <[email protected]> AuthorDate: Thu May 20 12:56:26 2021 +0200 Removes Camel K YAML loader Fixes GH issue #679 --- camel-k-loader-yaml/deployment/pom.xml | 63 -------- .../deployment/YamlSourceLoaderFeature.java | 29 ---- .../deployment/YamlSourceLoaderProcessor.java | 34 ----- camel-k-loader-yaml/impl/pom.xml | 143 ------------------- .../yaml/YamlDeserializerEndpointAwareBase.java | 73 ---------- .../yaml/YamlSourceLoaderDeserializerResolver.java | 70 --------- .../k/loader/yaml/YamlSourceLoaderSupport.java | 62 -------- .../SagaActionUriDefinitionDeserializer.java | 74 ---------- .../deserializers/ToDefinitionDeserializer.java | 79 ----------- .../ToDynamicDefinitionDeserializer.java | 99 ------------- .../k/loader/yaml/YamlSourceLoaderTest.groovy | 158 --------------------- .../camel/k/loader/yaml/support/TestRuntime.groovy | 69 --------- .../impl/src/test/resources/log4j2-test.xml | 35 ----- .../impl/src/test/resources/yaml/routes.yaml | 24 ---- .../impl/src/test/resources/yaml/routes_all.yaml | 27 ---- .../impl/src/test/resources/yaml/routes_from.yaml | 23 --- .../impl/src/test/resources/yaml/routes_to.yaml | 24 ---- .../src/test/resources/yaml/routes_to_dynamic.yaml | 24 ---- .../resources/yaml/routes_to_dynamic_alias.yaml | 24 ---- .../yaml/routes_to_dynamic_alias_out_of_order.yaml | 24 ---- .../yaml/routes_to_dynamic_out_of_order.yaml | 24 ---- .../resources/yaml/routes_to_out_of_order.yaml | 24 ---- camel-k-loader-yaml/pom.xml | 37 ----- camel-k-loader-yaml/runtime/pom.xml | 90 ------------ .../yaml/quarkus/YamlSourceLoaderRecorder.java | 29 ---- pom.xml | 1 - 26 files changed, 1363 deletions(-) diff --git a/camel-k-loader-yaml/deployment/pom.xml b/camel-k-loader-yaml/deployment/pom.xml deleted file mode 100644 index 1e734d3..0000000 --- a/camel-k-loader-yaml/deployment/pom.xml +++ /dev/null @@ -1,63 +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. - ---> -<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> - <parent> - <groupId>org.apache.camel.k</groupId> - <artifactId>camel-k-loader-yaml-parent</artifactId> - <version>1.8.0-SNAPSHOT</version> - </parent> - <modelVersion>4.0.0</modelVersion> - - <artifactId>camel-k-loader-yaml-deployment</artifactId> - - <dependencies> - <dependency> - <groupId>org.apache.camel.k</groupId> - <artifactId>camel-k-loader-yaml</artifactId> - </dependency> - <dependency> - <groupId>org.apache.camel.k</groupId> - <artifactId>camel-k-core-deployment</artifactId> - </dependency> - <dependency> - <groupId>org.apache.camel.quarkus</groupId> - <artifactId>camel-quarkus-yaml-dsl-deployment</artifactId> - </dependency> - </dependencies> - - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <annotationProcessorPaths> - <path> - <groupId>io.quarkus</groupId> - <artifactId>quarkus-extension-processor</artifactId> - <version>${quarkus-version}</version> - </path> - </annotationProcessorPaths> - </configuration> - </plugin> - </plugins> - </build> - -</project> diff --git a/camel-k-loader-yaml/deployment/src/main/java/org/apache/camel/k/loader/yaml/quarkus/deployment/YamlSourceLoaderFeature.java b/camel-k-loader-yaml/deployment/src/main/java/org/apache/camel/k/loader/yaml/quarkus/deployment/YamlSourceLoaderFeature.java deleted file mode 100644 index 248d23b..0000000 --- a/camel-k-loader-yaml/deployment/src/main/java/org/apache/camel/k/loader/yaml/quarkus/deployment/YamlSourceLoaderFeature.java +++ /dev/null @@ -1,29 +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.k.loader.yaml.quarkus.deployment; - -import io.quarkus.deployment.annotations.BuildStep; -import io.quarkus.deployment.builditem.FeatureBuildItem; - -public class YamlSourceLoaderFeature { - private static final String FEATURE = "camel-k-loader-yaml"; - - @BuildStep - FeatureBuildItem feature() { - return new FeatureBuildItem(FEATURE); - } -} diff --git a/camel-k-loader-yaml/deployment/src/main/java/org/apache/camel/k/loader/yaml/quarkus/deployment/YamlSourceLoaderProcessor.java b/camel-k-loader-yaml/deployment/src/main/java/org/apache/camel/k/loader/yaml/quarkus/deployment/YamlSourceLoaderProcessor.java deleted file mode 100644 index 80807c7..0000000 --- a/camel-k-loader-yaml/deployment/src/main/java/org/apache/camel/k/loader/yaml/quarkus/deployment/YamlSourceLoaderProcessor.java +++ /dev/null @@ -1,34 +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.k.loader.yaml.quarkus.deployment; - -import io.quarkus.deployment.annotations.BuildStep; -import io.quarkus.deployment.annotations.ExecutionTime; -import io.quarkus.deployment.annotations.Record; -import org.apache.camel.k.loader.yaml.quarkus.YamlSourceLoaderRecorder; -import org.apache.camel.quarkus.core.deployment.spi.CamelBeanBuildItem; - -public class YamlSourceLoaderProcessor { - @Record(ExecutionTime.STATIC_INIT) - @BuildStep() - CamelBeanBuildItem feature(YamlSourceLoaderRecorder recorder) { - return new CamelBeanBuildItem( - "__camel_k_resolver", - "org.apache.camel.dsl.yaml.common.YamlDeserializerResolver", - recorder.createDeserializer()); - } -} diff --git a/camel-k-loader-yaml/impl/pom.xml b/camel-k-loader-yaml/impl/pom.xml deleted file mode 100644 index a3d57ce..0000000 --- a/camel-k-loader-yaml/impl/pom.xml +++ /dev/null @@ -1,143 +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. - ---> -<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> - <parent> - <groupId>org.apache.camel.k</groupId> - <artifactId>camel-k-loader-yaml-parent</artifactId> - <version>1.8.0-SNAPSHOT</version> - </parent> - <modelVersion>4.0.0</modelVersion> - - <artifactId>camel-k-loader-yaml-impl</artifactId> - - <dependencies> - <dependency> - <groupId>org.apache.camel.k</groupId> - <artifactId>camel-k-core-support</artifactId> - </dependency> - <dependency> - <groupId>org.apache.camel</groupId> - <artifactId>camel-core-engine</artifactId> - </dependency> - <dependency> - <groupId>org.apache.camel</groupId> - <artifactId>camel-yaml-dsl</artifactId> - </dependency> - - <dependency> - <groupId>org.apache.camel.k</groupId> - <artifactId>camel-k-apt</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.apache.camel.k</groupId> - <artifactId>camel-k-annotations</artifactId> - <scope>provided</scope> - </dependency> - - <!-- ****************************** --> - <!-- --> - <!-- TESTS --> - <!-- --> - <!-- ****************************** --> - - <dependency> - <groupId>org.apache.camel.k</groupId> - <artifactId>camel-k-test</artifactId> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>org.apache.camel</groupId> - <artifactId>camel-main</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.camel</groupId> - <artifactId>camel-bean</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.camel</groupId> - <artifactId>camel-undertow</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.camel</groupId> - <artifactId>camel-timer</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.camel</groupId> - <artifactId>camel-seda</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.camel</groupId> - <artifactId>camel-log</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.camel</groupId> - <artifactId>camel-rest</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.camel</groupId> - <artifactId>camel-direct</artifactId> - <scope>test</scope> - </dependency> - </dependencies> - - <build> - <plugins> - <plugin> - <groupId>org.codehaus.gmavenplus</groupId> - <artifactId>gmavenplus-plugin</artifactId> - <executions> - <execution> - <goals> - <goal>addSources</goal> - <goal>addTestSources</goal> - <goal>compile</goal> - <goal>compileTests</goal> - </goals> - </execution> - </executions> - <configuration> - <invokeDynamic>true</invokeDynamic> - </configuration> - </plugin> - <plugin> - <groupId>org.jboss.jandex</groupId> - <artifactId>jandex-maven-plugin</artifactId> - <executions> - <execution> - <id>make-index</id> - <goals> - <goal>jandex</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </build> - -</project> diff --git a/camel-k-loader-yaml/impl/src/main/java/org/apache/camel/k/loader/yaml/YamlDeserializerEndpointAwareBase.java b/camel-k-loader-yaml/impl/src/main/java/org/apache/camel/k/loader/yaml/YamlDeserializerEndpointAwareBase.java deleted file mode 100644 index 644aeb8..0000000 --- a/camel-k-loader-yaml/impl/src/main/java/org/apache/camel/k/loader/yaml/YamlDeserializerEndpointAwareBase.java +++ /dev/null @@ -1,73 +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.k.loader.yaml; - -import java.util.Locale; -import java.util.Map; - -import org.apache.camel.CamelContext; -import org.apache.camel.dsl.yaml.common.YamlDeserializationContext; -import org.apache.camel.dsl.yaml.common.YamlDeserializerBase; -import org.apache.camel.util.StringHelper; -import org.snakeyaml.engine.v2.nodes.MappingNode; -import org.snakeyaml.engine.v2.nodes.Node; -import org.snakeyaml.engine.v2.nodes.NodeTuple; -import org.snakeyaml.engine.v2.nodes.ScalarNode; - -public abstract class YamlDeserializerEndpointAwareBase<T> extends YamlDeserializerBase<T> { - - public YamlDeserializerEndpointAwareBase(Class<T> type) { - super(type); - } - - /** - * Set properties from a YAML node to the given target. - * - * @param node the node - * @param target the target object - */ - protected void setProperties(T target, MappingNode node) { - YamlDeserializationContext dc = getDeserializationContext(node); - - Map<String, Object> parameters = null; - - for (NodeTuple tuple : node.getValue()) { - final ScalarNode key = (ScalarNode) tuple.getKeyNode(); - final String propertyName = StringHelper.camelCaseToDash(key.getValue()).toLowerCase(Locale.US); - final Node val = tuple.getValueNode(); - - setDeserializationContext(val, dc); - - switch (propertyName) { - case "parameters": - case "properties": - parameters = asScalarMap(tuple.getValueNode()); - break; - default: - if (!setProperty(target, propertyName, key.getValue(), val)) { - handleUnknownProperty(target, propertyName, key.getValue(), val); - } - } - } - - if (parameters != null) { - setEndpointUri(dc.getCamelContext(), target, parameters); - } - } - - protected abstract void setEndpointUri(CamelContext context, T target, Map<String, Object> parameters); -} diff --git a/camel-k-loader-yaml/impl/src/main/java/org/apache/camel/k/loader/yaml/YamlSourceLoaderDeserializerResolver.java b/camel-k-loader-yaml/impl/src/main/java/org/apache/camel/k/loader/yaml/YamlSourceLoaderDeserializerResolver.java deleted file mode 100644 index 7018ffe..0000000 --- a/camel-k-loader-yaml/impl/src/main/java/org/apache/camel/k/loader/yaml/YamlSourceLoaderDeserializerResolver.java +++ /dev/null @@ -1,70 +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.k.loader.yaml; - -import org.apache.camel.dsl.yaml.common.YamlDeserializerResolver; -import org.apache.camel.k.loader.yaml.deserializers.SagaActionUriDefinitionDeserializer; -import org.apache.camel.k.loader.yaml.deserializers.ToDefinitionDeserializer; -import org.apache.camel.k.loader.yaml.deserializers.ToDynamicDefinitionDeserializer; -import org.snakeyaml.engine.v2.api.ConstructNode; -import org.snakeyaml.engine.v2.nodes.Node; - -// TODO: remove it when https://issues.apache.org/jira/browse/CAMEL-16424 get fixed -public class YamlSourceLoaderDeserializerResolver implements YamlDeserializerResolver { - @Override - public int getOrder() { - return YamlDeserializerResolver.ORDER_HIGHEST; - } - - @Override - public ConstructNode resolve(String id) { - switch (id) { - case "from": - return new RouteFromDeserializer(); - case "org.apache.camel.model.FromDefinition": - return new FromDeserializer(); - case "to": - case "org.apache.camel.model.ToDefinition": - return new ToDefinitionDeserializer(); - case "tod": - case "to-d": - case "org.apache.camel.model.ToDynamicDefinition": - return new ToDynamicDefinitionDeserializer(); - case "org.apache.camel.model.SagaActionUriDefinition": - return new SagaActionUriDefinitionDeserializer(); - default: - return null; - } - } - - public static class FromDeserializer extends org.apache.camel.dsl.yaml.deserializers.FromDefinitionDeserializer { - @Override - public Object construct(Node node) { - return super.construct( - YamlSourceLoaderSupport.properties2parameters(node) - ); - } - } - public static class RouteFromDeserializer extends org.apache.camel.dsl.yaml.deserializers.RouteFromDefinitionDeserializer { - @Override - public Object construct(Node node) { - return super.construct( - YamlSourceLoaderSupport.properties2parameters(node) - ); - } - } -} diff --git a/camel-k-loader-yaml/impl/src/main/java/org/apache/camel/k/loader/yaml/YamlSourceLoaderSupport.java b/camel-k-loader-yaml/impl/src/main/java/org/apache/camel/k/loader/yaml/YamlSourceLoaderSupport.java deleted file mode 100644 index 67137c9..0000000 --- a/camel-k-loader-yaml/impl/src/main/java/org/apache/camel/k/loader/yaml/YamlSourceLoaderSupport.java +++ /dev/null @@ -1,62 +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.k.loader.yaml; - -import org.snakeyaml.engine.v2.nodes.MappingNode; -import org.snakeyaml.engine.v2.nodes.Node; -import org.snakeyaml.engine.v2.nodes.NodeTuple; -import org.snakeyaml.engine.v2.nodes.NodeType; -import org.snakeyaml.engine.v2.nodes.ScalarNode; - -import static org.apache.camel.dsl.yaml.common.YamlDeserializerSupport.asText; - -public final class YamlSourceLoaderSupport { - private YamlSourceLoaderSupport() { - } - - /** - * Workaround for https://issues.apache.org/jira/browse/CAMEL-16424 - * - * TODO: remove once issue is fixed - * - */ - public static Node properties2parameters(Node node) { - if (node.getNodeType() == NodeType.MAPPING) { - final MappingNode mn = (MappingNode) node; - - for (int i = 0; i < mn.getValue().size(); i++) { - final NodeTuple tuple = mn.getValue().get(i); - final String key = asText(tuple.getKeyNode()); - - if ("parameters".equals(key)) { - NodeTuple newNode = new NodeTuple( - new ScalarNode( - tuple.getKeyNode().getTag(), - "properties", - ((ScalarNode)tuple.getKeyNode()).getScalarStyle()), - tuple.getValueNode()); - - mn.getValue().set(i, newNode); - - break; - } - } - } - - return node; - } -} diff --git a/camel-k-loader-yaml/impl/src/main/java/org/apache/camel/k/loader/yaml/deserializers/SagaActionUriDefinitionDeserializer.java b/camel-k-loader-yaml/impl/src/main/java/org/apache/camel/k/loader/yaml/deserializers/SagaActionUriDefinitionDeserializer.java deleted file mode 100644 index db48973..0000000 --- a/camel-k-loader-yaml/impl/src/main/java/org/apache/camel/k/loader/yaml/deserializers/SagaActionUriDefinitionDeserializer.java +++ /dev/null @@ -1,74 +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.k.loader.yaml.deserializers; - -import java.util.Map; - -import org.apache.camel.CamelContext; -import org.apache.camel.dsl.yaml.common.YamlSupport; -import org.apache.camel.dsl.yaml.deserializers.EndpointProducerDeserializersResolver; -import org.apache.camel.k.loader.yaml.YamlDeserializerEndpointAwareBase; -import org.apache.camel.model.SagaActionUriDefinition; -import org.snakeyaml.engine.v2.nodes.Node; - -public class SagaActionUriDefinitionDeserializer extends YamlDeserializerEndpointAwareBase<SagaActionUriDefinition> { - public SagaActionUriDefinitionDeserializer() { - super(SagaActionUriDefinition.class); - } - - @Override - protected SagaActionUriDefinition newInstance() { - return new SagaActionUriDefinition(); - } - - @Override - protected SagaActionUriDefinition newInstance(String value) { - return new SagaActionUriDefinition(value); - } - - @Override - protected void setEndpointUri(CamelContext camelContext, SagaActionUriDefinition target, Map<String, Object> parameters) { - target.setUri(YamlSupport.createEndpointUri(camelContext, target.getUri(), parameters)); - } - - @Override - protected boolean setProperty(SagaActionUriDefinition target, String propertyKey, String propertyName, Node node) { - switch(propertyKey) { - case "inherit-error-handler": { - String val = asText(node); - target.setInheritErrorHandler(Boolean.valueOf(val)); - break; - } - case "uri": { - String val = asText(node); - target.setUri(val); - break; - } - default: { - String uri = EndpointProducerDeserializersResolver.resolveEndpointUri(propertyKey, node); - if (uri == null) { - return false; - } - if (target.getUri() != null) { - throw new IllegalStateException("url must not be set when using Endpoint DSL"); - } - target.setUri(uri); - } - } - return true; - } -} diff --git a/camel-k-loader-yaml/impl/src/main/java/org/apache/camel/k/loader/yaml/deserializers/ToDefinitionDeserializer.java b/camel-k-loader-yaml/impl/src/main/java/org/apache/camel/k/loader/yaml/deserializers/ToDefinitionDeserializer.java deleted file mode 100644 index 81dbbef..0000000 --- a/camel-k-loader-yaml/impl/src/main/java/org/apache/camel/k/loader/yaml/deserializers/ToDefinitionDeserializer.java +++ /dev/null @@ -1,79 +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.k.loader.yaml.deserializers; - -import java.util.Map; - -import org.apache.camel.CamelContext; -import org.apache.camel.dsl.yaml.common.YamlSupport; -import org.apache.camel.dsl.yaml.deserializers.EndpointProducerDeserializersResolver; -import org.apache.camel.k.loader.yaml.YamlDeserializerEndpointAwareBase; -import org.apache.camel.model.ToDefinition; -import org.snakeyaml.engine.v2.nodes.Node; - -public class ToDefinitionDeserializer extends YamlDeserializerEndpointAwareBase<ToDefinition> { - public ToDefinitionDeserializer() { - super(ToDefinition.class); - } - - @Override - protected ToDefinition newInstance() { - return new ToDefinition(); - } - - @Override - protected ToDefinition newInstance(String value) { - return new ToDefinition(value); - } - - @Override - protected void setEndpointUri(CamelContext camelContext, ToDefinition target, Map<String, Object> parameters) { - target.setUri(YamlSupport.createEndpointUri(camelContext, target.getUri(), parameters)); - } - - @Override - protected boolean setProperty(ToDefinition target, String propertyKey, String propertyName, Node node) { - switch(propertyKey) { - case "inherit-error-handler": { - String val = asText(node); - target.setInheritErrorHandler(Boolean.valueOf(val)); - break; - } - case "pattern": { - String val = asText(node); - target.setPattern(val); - break; - } - case "uri": { - String val = asText(node); - target.setUri(val); - break; - } - default: { - String uri = EndpointProducerDeserializersResolver.resolveEndpointUri(propertyKey, node); - if (uri == null) { - return false; - } - if (target.getUri() != null) { - throw new IllegalStateException("url must not be set when using Endpoint DSL"); - } - target.setUri(uri); - } - } - return true; - } -} diff --git a/camel-k-loader-yaml/impl/src/main/java/org/apache/camel/k/loader/yaml/deserializers/ToDynamicDefinitionDeserializer.java b/camel-k-loader-yaml/impl/src/main/java/org/apache/camel/k/loader/yaml/deserializers/ToDynamicDefinitionDeserializer.java deleted file mode 100644 index 401c944..0000000 --- a/camel-k-loader-yaml/impl/src/main/java/org/apache/camel/k/loader/yaml/deserializers/ToDynamicDefinitionDeserializer.java +++ /dev/null @@ -1,99 +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.k.loader.yaml.deserializers; - -import java.util.Map; - -import org.apache.camel.CamelContext; -import org.apache.camel.dsl.yaml.common.YamlSupport; -import org.apache.camel.dsl.yaml.deserializers.EndpointProducerDeserializersResolver; -import org.apache.camel.k.loader.yaml.YamlDeserializerEndpointAwareBase; -import org.apache.camel.model.ToDynamicDefinition; -import org.snakeyaml.engine.v2.nodes.Node; - -public class ToDynamicDefinitionDeserializer extends YamlDeserializerEndpointAwareBase<ToDynamicDefinition> { - public ToDynamicDefinitionDeserializer() { - super(ToDynamicDefinition.class); - } - - @Override - protected ToDynamicDefinition newInstance() { - return new ToDynamicDefinition(); - } - - @Override - protected ToDynamicDefinition newInstance(String value) { - return new ToDynamicDefinition(value); - } - - @Override - protected void setEndpointUri(CamelContext camelContext, ToDynamicDefinition target, Map<String, Object> parameters) { - target.setUri(YamlSupport.createEndpointUri(camelContext, target.getUri(), parameters)); - } - - @Override - protected boolean setProperty(ToDynamicDefinition target, String propertyKey, String propertyName, Node node) { - switch(propertyKey) { - case "allow-optimised-components": { - String val = asText(node); - target.setAllowOptimisedComponents(val); - break; - } - case "auto-start-components": { - String val = asText(node); - target.setAutoStartComponents(val); - break; - } - case "cache-size": { - String val = asText(node); - target.setCacheSize(val); - break; - } - case "ignore-invalid-endpoint": { - String val = asText(node); - target.setIgnoreInvalidEndpoint(val); - break; - } - case "inherit-error-handler": { - String val = asText(node); - target.setInheritErrorHandler(Boolean.valueOf(val)); - break; - } - case "pattern": { - String val = asText(node); - target.setPattern(val); - break; - } - case "uri": { - String val = asText(node); - target.setUri(val); - break; - } - default: { - String uri = EndpointProducerDeserializersResolver.resolveEndpointUri(propertyKey, node); - if (uri == null) { - return false; - } - if (target.getUri() != null) { - throw new IllegalStateException("url must not be set when using Endpoint DSL"); - } - target.setUri(uri); - } - } - return true; - } -} diff --git a/camel-k-loader-yaml/impl/src/test/groovy/org/apache/camel/k/loader/yaml/YamlSourceLoaderTest.groovy b/camel-k-loader-yaml/impl/src/test/groovy/org/apache/camel/k/loader/yaml/YamlSourceLoaderTest.groovy deleted file mode 100644 index dae6386..0000000 --- a/camel-k-loader-yaml/impl/src/test/groovy/org/apache/camel/k/loader/yaml/YamlSourceLoaderTest.groovy +++ /dev/null @@ -1,158 +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.k.loader.yaml - -import org.apache.camel.component.direct.DirectEndpoint -import org.apache.camel.component.log.LogEndpoint -import org.apache.camel.k.loader.yaml.support.TestRuntime -import org.apache.camel.model.ToDefinition -import org.apache.camel.model.ToDynamicDefinition -import spock.lang.AutoCleanup -import spock.lang.Specification - -class YamlSourceLoaderTest extends Specification { - @AutoCleanup - def runtime = new TestRuntime() - - def "to with parameters"() { - expect: - runtime.loadRoutes('classpath:yaml/routes_to.yaml') - runtime.start() - - with(runtime.context.routeDefinitions) { - it[0].input.endpointUri ==~ /direct:.*start/ - it[0].outputs[0] instanceof ToDefinition - } - with(runtime.context.endpoints.find {it instanceof LogEndpoint}, LogEndpoint) { - it.showAll - it.multiline - } - } - - def "to with out of order parameters"() { - expect: - runtime.loadRoutes('classpath:yaml/routes_to_out_of_order.yaml') - runtime.start() - - with(runtime.context.routeDefinitions) { - it[0].input.endpointUri ==~ /direct:.*start/ - it[0].outputs[0] instanceof ToDefinition - } - with(runtime.context.endpoints.find {it instanceof LogEndpoint}, LogEndpoint) { - it.showAll - it.multiline - } - } - - def "to dynamic with parameters"() { - expect: - runtime.loadRoutes('classpath:yaml/routes_to_dynamic.yaml') - runtime.start() - - with(runtime.context.routeDefinitions) { - it[0].input.endpointUri ==~ /direct:.*start/ - with (it[0].outputs[0], ToDynamicDefinition) { - it.uri == 'log:info?multiline=true&showAll=true' - } - } - } - - def "to dynamic with out of order parameters"() { - expect: - runtime.loadRoutes('classpath:yaml/routes_to_dynamic_out_of_order.yaml') - runtime.start() - - with(runtime.context.routeDefinitions) { - it[0].input.endpointUri ==~ /direct:.*start/ - with (it[0].outputs[0], ToDynamicDefinition) { - it.uri == 'log:info?multiline=true&showAll=true' - } - } - } - - def "to dynamic alias with parameters"() { - expect: - runtime.loadRoutes('classpath:yaml/routes_to_dynamic_alias.yaml') - runtime.start() - - with(runtime.context.routeDefinitions) { - it[0].input.endpointUri ==~ /direct:.*start/ - with (it[0].outputs[0], ToDynamicDefinition) { - it.uri == 'log:info?multiline=true&showAll=true' - } - } - } - - def "to dynamic alias with out of order parameters"() { - expect: - runtime.loadRoutes('classpath:yaml/routes_to_dynamic_alias_out_of_order.yaml') - runtime.start() - - with(runtime.context.routeDefinitions) { - it[0].input.endpointUri ==~ /direct:.*start/ - with (it[0].outputs[0], ToDynamicDefinition) { - it.uri == 'log:info?multiline=true&showAll=true' - } - } - } - - def "from with parameters"() { - expect: - runtime.loadRoutes('classpath:yaml/routes_from.yaml') - runtime.start() - - with(runtime.context.routeDefinitions) { - it[0].input.endpointUri ==~ /direct:.*start\?.*/ - it[0].outputs[0] instanceof ToDefinition - } - with(runtime.context.endpoints.find {it instanceof DirectEndpoint}, DirectEndpoint) { - it.timeout == 1234L - } - } - - def "route with parameters"() { - expect: - runtime.loadRoutes('classpath:yaml/routes.yaml') - runtime.start() - - with(runtime.context.routeDefinitions) { - it[0].input.endpointUri ==~ /direct:.*start\?.*/ - it[0].outputs[0] instanceof ToDefinition - } - with(runtime.context.endpoints.find {it instanceof DirectEndpoint}, DirectEndpoint) { - it.timeout == 1234L - } - } - - def "all"() { - expect: - runtime.loadRoutes('classpath:yaml/routes_all.yaml') - runtime.start() - - with(runtime.context.routeDefinitions) { - it[0].input.endpointUri ==~ /direct:.*start\?.*/ - it[0].outputs[0] instanceof ToDefinition - } - with(runtime.context.endpoints.find {it instanceof DirectEndpoint}, DirectEndpoint) { - it.timeout == 1234L - } - with(runtime.context.endpoints.find {it instanceof LogEndpoint}, LogEndpoint) { - it.showAll - it.multiline - } - } -} diff --git a/camel-k-loader-yaml/impl/src/test/groovy/org/apache/camel/k/loader/yaml/support/TestRuntime.groovy b/camel-k-loader-yaml/impl/src/test/groovy/org/apache/camel/k/loader/yaml/support/TestRuntime.groovy deleted file mode 100644 index 9bffbfa..0000000 --- a/camel-k-loader-yaml/impl/src/test/groovy/org/apache/camel/k/loader/yaml/support/TestRuntime.groovy +++ /dev/null @@ -1,69 +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.k.loader.yaml.support - -import org.apache.camel.CamelContext -import org.apache.camel.RoutesBuilder -import org.apache.camel.impl.DefaultCamelContext -import org.apache.camel.k.CompositeClassloader -import org.apache.camel.k.Runtime -import org.apache.camel.k.loader.yaml.YamlSourceLoaderDeserializerResolver -import org.apache.camel.k.support.SourcesSupport -import org.apache.camel.model.ModelCamelContext - -class TestRuntime implements Runtime, AutoCloseable { - final ModelCamelContext context - final List<RoutesBuilder> builders - final List<Object> configurations - - TestRuntime() { - this.context = new DefaultCamelContext() - this.context.setApplicationContextClassLoader(new CompositeClassloader()) - this.context.registry.bind("__camel_k_yaml", new YamlSourceLoaderDeserializerResolver()) - this.builders = [] - this.configurations = [] - } - - @Override - CamelContext getCamelContext() { - return this.context - } - - @Override - void addRoutes(RoutesBuilder builder) { - this.builders << builder - this.context.addRoutes(builder) - } - - void loadRoutes(String... routes) { - SourcesSupport.loadSources(this, routes) - } - - void start() { - context.start() - } - - @Override - void stop() { - context.stop() - } - - @Override - void close() { - stop() - } -} diff --git a/camel-k-loader-yaml/impl/src/test/resources/log4j2-test.xml b/camel-k-loader-yaml/impl/src/test/resources/log4j2-test.xml deleted file mode 100644 index e2e9f42..0000000 --- a/camel-k-loader-yaml/impl/src/test/resources/log4j2-test.xml +++ /dev/null @@ -1,35 +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. - ---> -<Configuration status="INFO"> - <Appenders> - <Console name="STDOUT" target="SYSTEM_OUT"> - <PatternLayout pattern="%d{yyyy-MM-dd HH:mm:ss.SSS}|%-5level|%t|%c{1} - %msg%n"/> - </Console> - <Null name="NONE"/> - </Appenders> - - <Loggers> - <Root level="INFO"> - <!--<AppenderRef ref="STDOUT"/>--> - <AppenderRef ref="NONE"/> - </Root> - </Loggers> - -</Configuration> \ No newline at end of file diff --git a/camel-k-loader-yaml/impl/src/test/resources/yaml/routes.yaml b/camel-k-loader-yaml/impl/src/test/resources/yaml/routes.yaml deleted file mode 100644 index 837d5e7..0000000 --- a/camel-k-loader-yaml/impl/src/test/resources/yaml/routes.yaml +++ /dev/null @@ -1,24 +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. -# -- route: - from: - uri: "direct:start" - parameters: - timeout: 1234 - steps: - - to: - uri: "log:info" \ No newline at end of file diff --git a/camel-k-loader-yaml/impl/src/test/resources/yaml/routes_all.yaml b/camel-k-loader-yaml/impl/src/test/resources/yaml/routes_all.yaml deleted file mode 100644 index 04f82dc..0000000 --- a/camel-k-loader-yaml/impl/src/test/resources/yaml/routes_all.yaml +++ /dev/null @@ -1,27 +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. -# -- route: - from: - uri: "direct:start" - parameters: - timeout: 1234 - steps: - - to: - uri: "log:info" - parameters: - show-all: true - multiline: true \ No newline at end of file diff --git a/camel-k-loader-yaml/impl/src/test/resources/yaml/routes_from.yaml b/camel-k-loader-yaml/impl/src/test/resources/yaml/routes_from.yaml deleted file mode 100644 index b1dca2c..0000000 --- a/camel-k-loader-yaml/impl/src/test/resources/yaml/routes_from.yaml +++ /dev/null @@ -1,23 +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. -# -- from: - uri: "direct:start" - parameters: - timeout: 1234 - steps: - - to: - uri: "log:info" \ No newline at end of file diff --git a/camel-k-loader-yaml/impl/src/test/resources/yaml/routes_to.yaml b/camel-k-loader-yaml/impl/src/test/resources/yaml/routes_to.yaml deleted file mode 100644 index ea01ecc..0000000 --- a/camel-k-loader-yaml/impl/src/test/resources/yaml/routes_to.yaml +++ /dev/null @@ -1,24 +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. -# -- from: - uri: "direct:start" - steps: - - to: - uri: "log:info" - parameters: - show-all: true - multiline: true \ No newline at end of file diff --git a/camel-k-loader-yaml/impl/src/test/resources/yaml/routes_to_dynamic.yaml b/camel-k-loader-yaml/impl/src/test/resources/yaml/routes_to_dynamic.yaml deleted file mode 100644 index 3f6bea6..0000000 --- a/camel-k-loader-yaml/impl/src/test/resources/yaml/routes_to_dynamic.yaml +++ /dev/null @@ -1,24 +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. -# -- from: - uri: "direct:start" - steps: - - to-d: - uri: "log:info" - parameters: - show-all: true - multiline: true \ No newline at end of file diff --git a/camel-k-loader-yaml/impl/src/test/resources/yaml/routes_to_dynamic_alias.yaml b/camel-k-loader-yaml/impl/src/test/resources/yaml/routes_to_dynamic_alias.yaml deleted file mode 100644 index 0ef99c8..0000000 --- a/camel-k-loader-yaml/impl/src/test/resources/yaml/routes_to_dynamic_alias.yaml +++ /dev/null @@ -1,24 +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. -# -- from: - uri: "direct:start" - steps: - - tod: - uri: "log:info" - parameters: - show-all: true - multiline: true \ No newline at end of file diff --git a/camel-k-loader-yaml/impl/src/test/resources/yaml/routes_to_dynamic_alias_out_of_order.yaml b/camel-k-loader-yaml/impl/src/test/resources/yaml/routes_to_dynamic_alias_out_of_order.yaml deleted file mode 100644 index c93c315..0000000 --- a/camel-k-loader-yaml/impl/src/test/resources/yaml/routes_to_dynamic_alias_out_of_order.yaml +++ /dev/null @@ -1,24 +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. -# -- from: - uri: "direct:start" - steps: - - tod: - parameters: - show-all: true - multiline: true - uri: "log:info" \ No newline at end of file diff --git a/camel-k-loader-yaml/impl/src/test/resources/yaml/routes_to_dynamic_out_of_order.yaml b/camel-k-loader-yaml/impl/src/test/resources/yaml/routes_to_dynamic_out_of_order.yaml deleted file mode 100644 index 9eedcfd..0000000 --- a/camel-k-loader-yaml/impl/src/test/resources/yaml/routes_to_dynamic_out_of_order.yaml +++ /dev/null @@ -1,24 +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. -# -- from: - uri: "direct:start" - steps: - - to-d: - parameters: - show-all: true - multiline: true - uri: "log:info" \ No newline at end of file diff --git a/camel-k-loader-yaml/impl/src/test/resources/yaml/routes_to_out_of_order.yaml b/camel-k-loader-yaml/impl/src/test/resources/yaml/routes_to_out_of_order.yaml deleted file mode 100644 index 5193868..0000000 --- a/camel-k-loader-yaml/impl/src/test/resources/yaml/routes_to_out_of_order.yaml +++ /dev/null @@ -1,24 +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. -# -- from: - uri: "direct:start" - steps: - - to: - parameters: - show-all: true - multiline: true - uri: "log:info" \ No newline at end of file diff --git a/camel-k-loader-yaml/pom.xml b/camel-k-loader-yaml/pom.xml deleted file mode 100644 index f75dba5..0000000 --- a/camel-k-loader-yaml/pom.xml +++ /dev/null @@ -1,37 +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. - ---> -<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> - <parent> - <groupId>org.apache.camel.k</groupId> - <artifactId>camel-k-runtime-project</artifactId> - <version>1.8.0-SNAPSHOT</version> - </parent> - <modelVersion>4.0.0</modelVersion> - <packaging>pom</packaging> - - <artifactId>camel-k-loader-yaml-parent</artifactId> - - <modules> - <module>impl</module> - <module>runtime</module> - <module>deployment</module> - </modules> - -</project> diff --git a/camel-k-loader-yaml/runtime/pom.xml b/camel-k-loader-yaml/runtime/pom.xml deleted file mode 100644 index 4b944e6..0000000 --- a/camel-k-loader-yaml/runtime/pom.xml +++ /dev/null @@ -1,90 +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. - ---> -<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> - <parent> - <groupId>org.apache.camel.k</groupId> - <artifactId>camel-k-loader-yaml-parent</artifactId> - <version>1.8.0-SNAPSHOT</version> - </parent> - <modelVersion>4.0.0</modelVersion> - - <artifactId>camel-k-loader-yaml</artifactId> - - <dependencies> - <dependency> - <groupId>org.apache.camel.k</groupId> - <artifactId>camel-k-core</artifactId> - </dependency> - <dependency> - <groupId>org.apache.camel.k</groupId> - <artifactId>camel-k-loader-yaml-impl</artifactId> - </dependency> - <dependency> - <groupId>org.apache.camel.quarkus</groupId> - <artifactId>camel-quarkus-yaml-dsl</artifactId> - </dependency> - </dependencies> - - <build> - <plugins> - <plugin> - <groupId>io.quarkus</groupId> - <artifactId>quarkus-bootstrap-maven-plugin</artifactId> - <version>${quarkus-version}</version> - <executions> - <execution> - <goals> - <goal>extension-descriptor</goal> - </goals> - <configuration> - <deployment>${project.groupId}:${project.artifactId}-deployment:${project.version}</deployment> - </configuration> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <annotationProcessorPaths> - <path> - <groupId>io.quarkus</groupId> - <artifactId>quarkus-extension-processor</artifactId> - <version>${quarkus-version}</version> - </path> - </annotationProcessorPaths> - </configuration> - </plugin> - <plugin> - <groupId>org.jboss.jandex</groupId> - <artifactId>jandex-maven-plugin</artifactId> - <executions> - <execution> - <id>make-index</id> - <goals> - <goal>jandex</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </build> - -</project> diff --git a/camel-k-loader-yaml/runtime/src/main/java/org/apache/camel/k/loader/yaml/quarkus/YamlSourceLoaderRecorder.java b/camel-k-loader-yaml/runtime/src/main/java/org/apache/camel/k/loader/yaml/quarkus/YamlSourceLoaderRecorder.java deleted file mode 100644 index 87389d0..0000000 --- a/camel-k-loader-yaml/runtime/src/main/java/org/apache/camel/k/loader/yaml/quarkus/YamlSourceLoaderRecorder.java +++ /dev/null @@ -1,29 +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.k.loader.yaml.quarkus; - -import io.quarkus.runtime.RuntimeValue; -import io.quarkus.runtime.annotations.Recorder; -import org.apache.camel.dsl.yaml.common.YamlDeserializerResolver; -import org.apache.camel.k.loader.yaml.YamlSourceLoaderDeserializerResolver; - -@Recorder -public class YamlSourceLoaderRecorder { - public RuntimeValue<YamlDeserializerResolver> createDeserializer() { - return new RuntimeValue<>(new YamlSourceLoaderDeserializerResolver()); - } -} diff --git a/pom.xml b/pom.xml index c1742a7..9480a7b 100644 --- a/pom.xml +++ b/pom.xml @@ -350,7 +350,6 @@ <module>camel-k-core</module> <module>camel-k-loader-jsh</module> - <module>camel-k-loader-yaml</module> <module>camel-k-cron</module> <module>camel-k-cloudevents</module>
