This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-kameleon.git
commit e10e3c9df34e1e2f1508bca4ed475a7dcf90de9f Author: Claus Ibsen <[email protected]> AuthorDate: Sat Aug 6 09:37:40 2022 +0200 #24 - Generate spring boot project to work and also use correct catalog for spring boot. --- pom.xml | 5 ++ .../kameleon/component/ComponentResource.java | 5 ++ .../component/SpringBootComponentService.java | 72 ++++++++++++++++++++++ .../camel/kameleon/generator/GeneratorService.java | 7 ++- 4 files changed, 86 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 0dd0fe2..831989e 100644 --- a/pom.xml +++ b/pom.xml @@ -93,6 +93,11 @@ under the License. <artifactId>camel-catalog</artifactId> <version>${version.camel-classic}</version> </dependency> + <dependency> + <groupId>org.apache.camel.springboot</groupId> + <artifactId>camel-catalog-provider-springboot</artifactId> + <version>${version.camel-classic}</version> + </dependency> <dependency> <groupId>org.apache.camel.kamelets</groupId> <artifactId>camel-kamelets-catalog</artifactId> diff --git a/src/main/java/org/apache/camel/kameleon/component/ComponentResource.java b/src/main/java/org/apache/camel/kameleon/component/ComponentResource.java index 35ad66d..0a839bd 100644 --- a/src/main/java/org/apache/camel/kameleon/component/ComponentResource.java +++ b/src/main/java/org/apache/camel/kameleon/component/ComponentResource.java @@ -31,6 +31,9 @@ public class ComponentResource { @Inject QuarkusComponentService quarkusComponentService; + @Inject + SpringBootComponentService springBootComponentService; + @Inject ClassicComponentService classicComponentService; @@ -45,6 +48,8 @@ public class ComponentResource { switch (type) { case "quarkus": return quarkusComponentService.components(); + case "spring": + return springBootComponentService.components(); case "kamelet": return kameletComponentService.components(); default: diff --git a/src/main/java/org/apache/camel/kameleon/component/SpringBootComponentService.java b/src/main/java/org/apache/camel/kameleon/component/SpringBootComponentService.java new file mode 100644 index 0000000..ac41722 --- /dev/null +++ b/src/main/java/org/apache/camel/kameleon/component/SpringBootComponentService.java @@ -0,0 +1,72 @@ +/* + * 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.kameleon.component; + +import io.vertx.core.json.JsonArray; +import org.apache.camel.catalog.CamelCatalog; +import org.apache.camel.catalog.DefaultCamelCatalog; +import org.apache.camel.catalog.quarkus.QuarkusRuntimeProvider; +import org.apache.camel.kameleon.model.CamelComponent; +import org.apache.camel.springboot.catalog.SpringBootRuntimeProvider; + +import javax.enterprise.context.ApplicationScoped; +import java.util.ArrayList; +import java.util.List; + +@ApplicationScoped +public class SpringBootComponentService extends AbstractComponentService { + + public JsonArray components() throws Exception { + CamelCatalog catalog = new DefaultCamelCatalog(); + catalog.setRuntimeProvider(new SpringBootRuntimeProvider()); + List<CamelComponent> list = new ArrayList<>(); + + catalog.findComponentNames().forEach(name -> { + String json = catalog.componentJSonSchema(name); + CamelComponent component = getCamelComponent(json, "component"); + if (!component.getDeprecated()) { + list.add(component); + } + }); + + catalog.findDataFormatNames().forEach(name -> { + String json = catalog.dataFormatJSonSchema(name); + CamelComponent component = getCamelComponent(json, "dataformat"); + if (!component.getDeprecated()) { + list.add(component); + } + }); + + catalog.findLanguageNames().forEach(name -> { + String json = catalog.languageJSonSchema(name); + CamelComponent component = getCamelComponent(json, "language"); + if (!component.getDeprecated()) { + list.add(component); + } + }); + + catalog.findOtherNames().forEach(name -> { + String json = catalog.otherJSonSchema(name); + CamelComponent component = getCamelComponent(json, "other"); + if (!component.getDeprecated()) { + list.add(component); + } + }); + + return new JsonArray(list); + } +} diff --git a/src/main/java/org/apache/camel/kameleon/generator/GeneratorService.java b/src/main/java/org/apache/camel/kameleon/generator/GeneratorService.java index 4db7156..0640eda 100644 --- a/src/main/java/org/apache/camel/kameleon/generator/GeneratorService.java +++ b/src/main/java/org/apache/camel/kameleon/generator/GeneratorService.java @@ -65,7 +65,7 @@ public class GeneratorService { generateClassicArchetype(temp, type, archetypeVersion, groupId, artifactId, version); Path path = Paths.get(folderName); if (Files.exists(path) && !components.isBlank() && !components.isEmpty()) { - addComponents(folderName, components); + addComponents(folderName, type, components); setJavaVersion(folderName, javaVersion); packageProject(folderName, zipFileName); } else if (Files.exists(path)) { @@ -82,7 +82,7 @@ public class GeneratorService { return zipFileName; } - private void addComponents(String folderName, String components) throws Exception { + private void addComponents(String folderName, String type, String components) throws Exception { File pom = new File(folderName, "pom.xml"); MavenXpp3Reader reader = new MavenXpp3Reader(); Model model = reader.read(new FileReader(pom)); @@ -90,7 +90,8 @@ public class GeneratorService { List<Dependency> additional = Arrays.stream(components.split(",")).distinct().map(s -> { Dependency dep = new Dependency(); dep.setArtifactId(s); - dep.setGroupId("org.apache.camel"); + String gid = type.equals("spring") ? "org.apache.camel.springboot" : "org.apache.camel"; + dep.setGroupId(gid); return dep; }).collect(Collectors.toList()); dependencies.addAll(additional);
