fix(catalog-generator): Use Label or Group for the EIP parameters gro…

…uping fix: #1381
KaotoIO · Oct 4, 2024 · 527849b · 527849b
1 parent 18d8ddd
commit 527849b
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 6 deletions.
diff --git a/packages/catalog-generator/pom.xml b/packages/catalog-generator/pom.xml
@@ -37,11 +37,6 @@
       <artifactId>camel-catalog</artifactId>
       <version>${version.camel}</version>
     </dependency>
-    <dependency>
-      <groupId>org.apache.camel</groupId>
-      <artifactId>camel-yaml-dsl</artifactId>
-      <version>${version.camel}</version>
-    </dependency>
     <dependency>
       <groupId>org.apache.camel</groupId>
       <artifactId>camel-catalog-maven</artifactId>
@@ -82,6 +77,12 @@
       <artifactId>commons-cli</artifactId>
       <version>1.9.0</version>
     </dependency>
+    <dependency>
+      <groupId>org.apache.camel</groupId>
+      <artifactId>camel-yaml-dsl</artifactId>
+      <version>${version.camel}</version>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>org.junit.jupiter</groupId>
       <artifactId>junit-jupiter</artifactId>

diff --git a/...atalog-generator/src/main/java/io/kaoto/camelcatalog/generator/CamelCatalogProcessor.java b/...atalog-generator/src/main/java/io/kaoto/camelcatalog/generator/CamelCatalogProcessor.java
@@ -373,7 +373,13 @@ public String getPatternCatalog() throws Exception {
                     required.add(propertyName);
                 }
 
-                propertySchema.put("group", catalogOp.getGroup());
+                /* In Apache Camel previous to 4.5.0, the displayName is stored in the label property */
+                if (catalogOp.getLabel() != null) {
+                    propertySchema.put("group", catalogOp.getLabel());
+                } else if (catalogOp.getGroup() != null) {
+                    propertySchema.put("group", catalogOp.getGroup());
+                }
+
                 sortedSchemaProperties.set(propertyName, propertySchema);
             }