This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch catalog in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit f13311b21f3717f6806cc70f94f73b537744eee0 Author: Claus Ibsen <[email protected]> AuthorDate: Tue Oct 8 15:09:17 2019 +0200 Fixes #75: Adding camel-quarkus-catalog --- .../quarkus/QuarkusRuntimeProviderTest.java | 53 +++++++++++++--------- .../quarkus/maven/PrepareCatalogQuarkusMojo.java | 19 ++++++-- 2 files changed, 47 insertions(+), 25 deletions(-) diff --git a/catalog/camel-quarkus-catalog/src/test/java/org/apache/camel/catalog/quarkus/QuarkusRuntimeProviderTest.java b/catalog/camel-quarkus-catalog/src/test/java/org/apache/camel/catalog/quarkus/QuarkusRuntimeProviderTest.java index 1c8e2e9..5867c5b 100644 --- a/catalog/camel-quarkus-catalog/src/test/java/org/apache/camel/catalog/quarkus/QuarkusRuntimeProviderTest.java +++ b/catalog/camel-quarkus-catalog/src/test/java/org/apache/camel/catalog/quarkus/QuarkusRuntimeProviderTest.java @@ -21,7 +21,6 @@ import java.util.List; import org.apache.camel.catalog.CamelCatalog; import org.apache.camel.catalog.DefaultCamelCatalog; import org.junit.BeforeClass; -import org.junit.Ignore; import org.junit.Test; import static org.junit.Assert.assertEquals; @@ -29,9 +28,6 @@ import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; -// TODO: Update - -@Ignore public class QuarkusRuntimeProviderTest { static CamelCatalog catalog; @@ -64,9 +60,15 @@ public class QuarkusRuntimeProviderTest { assertNotNull(names); assertFalse(names.isEmpty()); - assertTrue(names.contains("file")); - assertTrue(names.contains("ftp")); - assertTrue(names.contains("jms")); + assertTrue(names.contains("aws-eks")); + assertTrue(names.contains("bean")); + assertTrue(names.contains("direct")); + assertTrue(names.contains("imap")); + assertTrue(names.contains("imaps")); + assertTrue(names.contains("jdbc")); + assertTrue(names.contains("log")); + assertTrue(names.contains("servlet")); + assertTrue(names.contains("twitter-search")); // camel-pax-logging does not work in quarkus assertFalse(names.contains("paxlogging")); } @@ -78,8 +80,8 @@ public class QuarkusRuntimeProviderTest { assertNotNull(names); assertFalse(names.isEmpty()); - assertTrue(names.contains("bindy-csv")); - assertTrue(names.contains("zipdeflater")); + assertTrue(names.contains("csv")); + assertTrue(names.contains("mime-multipart")); assertTrue(names.contains("zipfile")); } @@ -90,9 +92,15 @@ public class QuarkusRuntimeProviderTest { assertNotNull(names); assertFalse(names.isEmpty()); + // core languages + assertTrue(names.contains("constant")); assertTrue(names.contains("simple")); - assertTrue(names.contains("spel")); - assertTrue(names.contains("xpath")); + + // quarkus-bean + assertTrue(names.contains("bean")); + + // spring expression language are not in quarkus + assertFalse(names.contains("spel")); } @Test @@ -102,43 +110,44 @@ public class QuarkusRuntimeProviderTest { assertNotNull(names); assertFalse(names.isEmpty()); - assertTrue(names.contains("hystrix")); - assertTrue(names.contains("spring-boot")); - assertTrue(names.contains("zipkin")); + assertTrue(names.contains("core-cloud")); + assertTrue(names.contains("platform-http")); + assertTrue(names.contains("reactive-executor")); assertFalse(names.contains("blueprint")); + assertFalse(names.contains("hystrix")); } @Test public void testComponentArtifactId() throws Exception { - String json = catalog.componentJSonSchema("ftp"); + String json = catalog.componentJSonSchema("salesforce"); assertNotNull(json); - assertTrue(json.contains("camel-ftp-starter")); + assertTrue(json.contains("camel-quarkus-salesforce")); } @Test public void testDataFormatArtifactId() throws Exception { - String json = catalog.dataFormatJSonSchema("bindy-csv"); + String json = catalog.dataFormatJSonSchema("csv"); assertNotNull(json); - assertTrue(json.contains("camel-bindy-starter")); + assertTrue(json.contains("camel-quarkus-csv")); } @Test public void testLanguageArtifactId() throws Exception { - String json = catalog.languageJSonSchema("spel"); + String json = catalog.languageJSonSchema("bean"); assertNotNull(json); - assertTrue(json.contains("camel-spring-starter")); + assertTrue(json.contains("camel-quarkus-bean")); } @Test public void testOtherArtifactId() throws Exception { - String json = catalog.otherJSonSchema("zipkin"); + String json = catalog.otherJSonSchema("reactive-executor"); assertNotNull(json); - assertTrue(json.contains("camel-zipkin-starter")); + assertTrue(json.contains("camel-quarkus-reactive-executor")); } } diff --git a/tooling/maven/package-maven-plugin/src/main/java/org/apache/camel/quarkus/maven/PrepareCatalogQuarkusMojo.java b/tooling/maven/package-maven-plugin/src/main/java/org/apache/camel/quarkus/maven/PrepareCatalogQuarkusMojo.java index 17bf3d2..3c84881 100644 --- a/tooling/maven/package-maven-plugin/src/main/java/org/apache/camel/quarkus/maven/PrepareCatalogQuarkusMojo.java +++ b/tooling/maven/package-maven-plugin/src/main/java/org/apache/camel/quarkus/maven/PrepareCatalogQuarkusMojo.java @@ -160,7 +160,12 @@ public class PrepareCatalogQuarkusMojo extends AbstractMojo { } protected void executeLanguages(Set<String> artifactIds) throws MojoExecutionException, MojoFailureException { - doExecute(artifactIds, "languages", languagesOutDir); + // include core languages (simple, header etc) and refer to camel-quarkus-core + Set<String> set = new LinkedHashSet<>(); + set.add("camel-base"); + set.addAll(artifactIds); + + doExecute(set, "languages", languagesOutDir); } protected void executeDataFormats(Set<String> artifactIds) throws MojoExecutionException, MojoFailureException { @@ -174,7 +179,7 @@ public class PrepareCatalogQuarkusMojo extends AbstractMojo { InputStream is = getClass().getClassLoader().getResourceAsStream("org/apache/camel/catalog/" + kind + ".properties"); String text = loadText(is); catalog = Arrays.asList(text.split("\n")); - getLog().info("Loaded " + catalog.size() + " " + kind + " from camel-catalog"); + getLog().debug("Loaded " + catalog.size() + " " + kind + " from camel-catalog"); } catch (IOException e) { throw new MojoFailureException("Error loading resource from camel-catalog due " + e.getMessage(), e); } @@ -200,7 +205,11 @@ public class PrepareCatalogQuarkusMojo extends AbstractMojo { for (String text : jsonFiles) { text = GROUP_PATTERN.matcher(text).replaceFirst("\"groupId\": \"org.apache.camel.quarkus\""); - text = ARTIFACT_PATTERN.matcher(text).replaceFirst("\"artifactId\": \"camel-quarkus-$1\""); + if ("camel-base".equals(artifactId)) { + text = ARTIFACT_PATTERN.matcher(text).replaceFirst("\"artifactId\": \"camel-quarkus-core\""); + } else { + text = ARTIFACT_PATTERN.matcher(text).replaceFirst("\"artifactId\": \"camel-quarkus-$1\""); + } text = VERSION_PATTERN.matcher(text).replaceFirst("\"version\": \"" + project.getVersion() + "\""); Pattern pattern = null; @@ -254,6 +263,8 @@ public class PrepareCatalogQuarkusMojo extends AbstractMojo { fos.close(); + getLog().info("Added " + lines.size() + " " + kind + " to quarkus-camel-catalog"); + } catch (IOException e) { throw new MojoFailureException("Error writing to file " + all); } @@ -338,6 +349,8 @@ public class PrepareCatalogQuarkusMojo extends AbstractMojo { fos.close(); + getLog().info("Added " + others.size() + " others to quarkus-camel-catalog"); + } catch (IOException e) { throw new MojoFailureException("Error writing to file " + all); }
