From 58d17c67a33eb459145dc0bf9e0f83253ff828c7 Mon Sep 17 00:00:00 2001
From: lburgazzoli <lburgazzoli@gmail.com>
Date: Wed, 22 May 2019 16:13:41 +0200
Subject: [PATCH] servlet: update catalog and bom

---
 .../processors/CatalogProcessor_2_x.java      | 15 ++++++
 .../processors/CatalogProcessor_3_x.java      | 15 ++++++
 .../processors/CataloProcessor2Test.java      | 47 +++++++++++++++++++
 .../processors/CataloProcessor3Test.java      | 47 +++++++++++++++++++
 camel-k-runtime-bom/pom.xml                   |  5 ++
 5 files changed, 129 insertions(+)

diff --git a/camel-k-maven-plugin/src/main/java/org/apache/camel/k/tooling/maven/processors/CatalogProcessor_2_x.java b/camel-k-maven-plugin/src/main/java/org/apache/camel/k/tooling/maven/processors/CatalogProcessor_2_x.java
index ee684ac97..82102954f 100644
--- a/camel-k-maven-plugin/src/main/java/org/apache/camel/k/tooling/maven/processors/CatalogProcessor_2_x.java
+++ b/camel-k-maven-plugin/src/main/java/org/apache/camel/k/tooling/maven/processors/CatalogProcessor_2_x.java
@@ -173,6 +173,21 @@ public void process(MavenProject project, CamelCatalog catalog, Map<String, Came
             artifacts.put(artifact.getArtifactId(), artifact);
         }
 
+        // ************************
+        //
+        // camel-k-runtime-servlet
+        //
+        // ************************
+
+        {
+            CamelArtifact artifact = new CamelArtifact();
+            artifact.setGroupId("org.apache.camel.k");
+            artifact.setArtifactId("camel-k-runtime-servlet");
+            artifact.addDependency("org.apache.camel", "camel-servlet");
+
+            artifacts.put(artifact.getArtifactId(), artifact);
+        }
+
         // ************************
         //
         //
diff --git a/camel-k-maven-plugin/src/main/java/org/apache/camel/k/tooling/maven/processors/CatalogProcessor_3_x.java b/camel-k-maven-plugin/src/main/java/org/apache/camel/k/tooling/maven/processors/CatalogProcessor_3_x.java
index 1553b81a6..8ebec01d8 100644
--- a/camel-k-maven-plugin/src/main/java/org/apache/camel/k/tooling/maven/processors/CatalogProcessor_3_x.java
+++ b/camel-k-maven-plugin/src/main/java/org/apache/camel/k/tooling/maven/processors/CatalogProcessor_3_x.java
@@ -162,6 +162,21 @@ public void process(MavenProject project, CamelCatalog catalog, Map<String, Came
             artifacts.put(artifact.getArtifactId(), artifact);
         }
 
+        // ************************
+        //
+        // camel-k-runtime-servlet
+        //
+        // ************************
+
+        {
+            CamelArtifact artifact = new CamelArtifact();
+            artifact.setGroupId("org.apache.camel.k");
+            artifact.setArtifactId("camel-k-runtime-servlet");
+            artifact.addDependency("org.apache.camel", "camel-servlet");
+
+            artifacts.put(artifact.getArtifactId(), artifact);
+        }
+
         // ************************
         //
         //
diff --git a/camel-k-maven-plugin/src/test/java/org/apache/camel/k/tooling/maven/processors/CataloProcessor2Test.java b/camel-k-maven-plugin/src/test/java/org/apache/camel/k/tooling/maven/processors/CataloProcessor2Test.java
index ec9bd4deb..ba4381687 100644
--- a/camel-k-maven-plugin/src/test/java/org/apache/camel/k/tooling/maven/processors/CataloProcessor2Test.java
+++ b/camel-k-maven-plugin/src/test/java/org/apache/camel/k/tooling/maven/processors/CataloProcessor2Test.java
@@ -17,7 +17,13 @@
 
 package org.apache.camel.k.tooling.maven.processors;
 
+import java.util.HashMap;
+import java.util.Map;
+
 import org.apache.camel.catalog.CamelCatalog;
+import org.apache.camel.k.tooling.maven.model.CamelArtifact;
+import org.apache.camel.k.tooling.maven.model.CatalogProcessor;
+import org.apache.maven.project.MavenProject;
 import org.junit.jupiter.api.Test;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -68,4 +74,45 @@ public void testAcceptMoreThanHigher(){
 
         assertThat(cp2.accepts(catalog)).isFalse();
     }
+
+    @Test
+    public void testArtifactsEnrichment(){
+        CatalogProcessor processor = new CatalogProcessor_2_x();
+        CamelCatalog catalog = versionCamelCatalog("2.23.0");
+        Map<String, CamelArtifact> artifactMap = new HashMap<>();
+
+        assertThat(processor.accepts(catalog)).isTrue();
+        processor.process(new MavenProject(), catalog, artifactMap);
+
+
+        assertThat(artifactMap.get("camel-k-runtime-jvm")).satisfies(a -> {
+            assertThat(a.getDependencies()).anyMatch(
+                d -> d.getGroupId().equals("org.apache.camel") && d.getArtifactId().equals("camel-core")
+            );
+            assertThat(a.getDependencies()).anyMatch(
+                d -> d.getGroupId().equals("org.apache.camel.k") && d.getArtifactId().equals("camel-k-adapter-camel-2")
+            );
+        });
+        assertThat(artifactMap.get("camel-k-runtime-groovy")).satisfies(a -> {
+            assertThat(a.getDependencies()).anyMatch(
+                d -> d.getGroupId().equals("org.apache.camel") && d.getArtifactId().equals("camel-groovy")
+            );
+        });
+        assertThat(artifactMap.get("camel-k-runtime-health")).satisfies(a -> {
+            assertThat(a.getDependencies()).anyMatch(
+                d -> d.getGroupId().equals("org.apache.camel") && d.getArtifactId().equals("camel-netty4-http")
+            );
+        });
+        assertThat(artifactMap.get("camel-k-runtime-servlet")).satisfies(a -> {
+            assertThat(a.getDependencies()).anyMatch(
+                d -> d.getGroupId().equals("org.apache.camel") && d.getArtifactId().equals("camel-servlet")
+            );
+        });
+
+        assertThat(artifactMap.get("camel-knative")).satisfies(a -> {
+            assertThat(a.getDependencies()).anyMatch(
+                d -> d.getGroupId().equals("org.apache.camel") && d.getArtifactId().equals("camel-netty4-http")
+            );
+        });
+    }
 }
diff --git a/camel-k-maven-plugin/src/test/java/org/apache/camel/k/tooling/maven/processors/CataloProcessor3Test.java b/camel-k-maven-plugin/src/test/java/org/apache/camel/k/tooling/maven/processors/CataloProcessor3Test.java
index 97d33c5aa..fd4bb9ca9 100644
--- a/camel-k-maven-plugin/src/test/java/org/apache/camel/k/tooling/maven/processors/CataloProcessor3Test.java
+++ b/camel-k-maven-plugin/src/test/java/org/apache/camel/k/tooling/maven/processors/CataloProcessor3Test.java
@@ -17,7 +17,13 @@
 
 package org.apache.camel.k.tooling.maven.processors;
 
+import java.util.HashMap;
+import java.util.Map;
+
 import org.apache.camel.catalog.CamelCatalog;
+import org.apache.camel.k.tooling.maven.model.CamelArtifact;
+import org.apache.camel.k.tooling.maven.model.CatalogProcessor;
+import org.apache.maven.project.MavenProject;
 import org.junit.jupiter.api.Test;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -68,4 +74,45 @@ public void testAcceptMoreThanHigher(){
 
         assertThat(cp3.accepts(catalog)).isFalse();
     }
+
+    @Test
+    public void testArtifactsEnrichment(){
+        CatalogProcessor processor = new CatalogProcessor_3_x();
+        CamelCatalog catalog = versionCamelCatalog("3.0.0");
+        Map<String, CamelArtifact> artifactMap = new HashMap<>();
+
+        assertThat(processor.accepts(catalog)).isTrue();
+        processor.process(new MavenProject(), catalog, artifactMap);
+
+
+        assertThat(artifactMap.get("camel-k-runtime-jvm")).satisfies(a -> {
+            assertThat(a.getDependencies()).anyMatch(
+                d -> d.getGroupId().equals("org.apache.camel") && d.getArtifactId().equals("camel-core")
+            );
+            assertThat(a.getDependencies()).anyMatch(
+                d -> d.getGroupId().equals("org.apache.camel.k") && d.getArtifactId().equals("camel-k-adapter-camel-3")
+            );
+        });
+        assertThat(artifactMap.get("camel-k-runtime-groovy")).satisfies(a -> {
+            assertThat(a.getDependencies()).anyMatch(
+                d -> d.getGroupId().equals("org.apache.camel") && d.getArtifactId().equals("camel-groovy")
+            );
+        });
+        assertThat(artifactMap.get("camel-k-runtime-health")).satisfies(a -> {
+            assertThat(a.getDependencies()).anyMatch(
+                d -> d.getGroupId().equals("org.apache.camel") && d.getArtifactId().equals("camel-netty4-http")
+            );
+        });
+        assertThat(artifactMap.get("camel-k-runtime-servlet")).satisfies(a -> {
+            assertThat(a.getDependencies()).anyMatch(
+                d -> d.getGroupId().equals("org.apache.camel") && d.getArtifactId().equals("camel-servlet")
+            );
+        });
+
+        assertThat(artifactMap.get("camel-knative")).satisfies(a -> {
+            assertThat(a.getDependencies()).anyMatch(
+                d -> d.getGroupId().equals("org.apache.camel") && d.getArtifactId().equals("camel-netty4-http")
+            );
+        });
+    }
 }
diff --git a/camel-k-runtime-bom/pom.xml b/camel-k-runtime-bom/pom.xml
index c123fd674..402ec0324 100644
--- a/camel-k-runtime-bom/pom.xml
+++ b/camel-k-runtime-bom/pom.xml
@@ -125,6 +125,11 @@
                 <artifactId>camel-k-runtime-health</artifactId>
                 <version>${project.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.apache.camel.k</groupId>
+                <artifactId>camel-k-runtime-servlet</artifactId>
+                <version>${project.version}</version>
+            </dependency>
             <dependency>
                 <groupId>org.apache.camel.k</groupId>
                 <artifactId>camel-knative</artifactId>