(camel) branch main updated: CAMEL-20892: Misleading error message when Kamelet misses mandatory field value

[davsclaus]

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.git


The following commit(s) were added to refs/heads/main by this push:
     new 344d4631878 CAMEL-20892: Misleading error message when Kamelet misses 
mandatory field value
344d4631878 is described below

commit 344d4631878ae511253ddea84525fe1e031656f2
Author: Claus Ibsen <claus.ib...@gmail.com>
AuthorDate: Wed Jun 19 20:11:22 2024 +0200

    CAMEL-20892: Misleading error message when Kamelet misses mandatory field 
value
---
 ...on.java => FailedToCreateKameletException.java} |  6 +++---
 .../camel/component/kamelet/KameletComponent.java  |  2 +-
 .../kamelet/KameletNotFoundException.java          | 23 ++++++----------------
 3 files changed, 10 insertions(+), 21 deletions(-)

diff --git 
a/components/camel-kamelet/src/main/java/org/apache/camel/component/kamelet/KameletNotFoundException.java
 
b/components/camel-kamelet/src/main/java/org/apache/camel/component/kamelet/FailedToCreateKameletException.java
similarity index 84%
copy from 
components/camel-kamelet/src/main/java/org/apache/camel/component/kamelet/KameletNotFoundException.java
copy to 
components/camel-kamelet/src/main/java/org/apache/camel/component/kamelet/FailedToCreateKameletException.java
index 7cae67394bb..8c400858443 100644
--- 
a/components/camel-kamelet/src/main/java/org/apache/camel/component/kamelet/KameletNotFoundException.java
+++ 
b/components/camel-kamelet/src/main/java/org/apache/camel/component/kamelet/FailedToCreateKameletException.java
@@ -18,13 +18,13 @@ package org.apache.camel.component.kamelet;
 
 import org.apache.camel.CamelException;
 
-public class KameletNotFoundException extends CamelException {
+public class FailedToCreateKameletException extends CamelException {
 
     private final String templateId;
     private final String locations;
 
-    public KameletNotFoundException(String templateId, String locations, 
Throwable cause) {
-        super("Error loading or creating Kamelet with id " + templateId + " 
(locations: " + locations + ")", cause);
+    public FailedToCreateKameletException(String templateId, String locations, 
Throwable cause) {
+        super("Error creating or loading Kamelet with id " + templateId + " 
(locations: " + locations + ")", cause);
         this.templateId = templateId;
         this.locations = locations;
     }
diff --git 
a/components/camel-kamelet/src/main/java/org/apache/camel/component/kamelet/KameletComponent.java
 
b/components/camel-kamelet/src/main/java/org/apache/camel/component/kamelet/KameletComponent.java
index adb6d154fc0..ace60eda2fe 100644
--- 
a/components/camel-kamelet/src/main/java/org/apache/camel/component/kamelet/KameletComponent.java
+++ 
b/components/camel-kamelet/src/main/java/org/apache/camel/component/kamelet/KameletComponent.java
@@ -442,7 +442,7 @@ public class KameletComponent extends DefaultComponent {
 
                 LOG.debug("Route with id={} created from template={}", id, 
templateId);
             } catch (Exception e) {
-                throw new KameletNotFoundException(templateId, loc, e);
+                throw new FailedToCreateKameletException(templateId, loc, e);
             }
         }
 
diff --git 
a/components/camel-kamelet/src/main/java/org/apache/camel/component/kamelet/KameletNotFoundException.java
 
b/components/camel-kamelet/src/main/java/org/apache/camel/component/kamelet/KameletNotFoundException.java
index 7cae67394bb..611bec055c7 100644
--- 
a/components/camel-kamelet/src/main/java/org/apache/camel/component/kamelet/KameletNotFoundException.java
+++ 
b/components/camel-kamelet/src/main/java/org/apache/camel/component/kamelet/KameletNotFoundException.java
@@ -16,24 +16,13 @@
  */
 package org.apache.camel.component.kamelet;
 
-import org.apache.camel.CamelException;
-
-public class KameletNotFoundException extends CamelException {
-
-    private final String templateId;
-    private final String locations;
+/**
+ * @deprecated use FailedToCreateKameletException
+ */
+@Deprecated(since = "4.7.0")
+public class KameletNotFoundException extends FailedToCreateKameletException {
 
     public KameletNotFoundException(String templateId, String locations, 
Throwable cause) {
-        super("Error loading or creating Kamelet with id " + templateId + " 
(locations: " + locations + ")", cause);
-        this.templateId = templateId;
-        this.locations = locations;
-    }
-
-    public String getTemplateId() {
-        return templateId;
-    }
-
-    public String getLocations() {
-        return locations;
+        super(templateId, locations, cause);
     }
 }