CAMEL-20333 camel-kotlin-api: fixed dataformat dsl generation

apache · Jan 22, 2024 · f0006d4 · f0006d4
1 parent c32dd0c
commit f0006d4
Show file tree

Hide file tree

Showing 6 changed files with 76 additions and 1 deletion.
diff --git a/dsl/camel-kotlin-api/src/generated/kotlin/org/apache/camel/kotlin/components/Aws2S3UriDsl.kt b/dsl/camel-kotlin-api/src/generated/kotlin/org/apache/camel/kotlin/components/Aws2S3UriDsl.kt
@@ -469,6 +469,10 @@ public class Aws2S3UriDsl(
     it.property("secretKey", secretKey)
   }
 
+  public fun sessionToken(sessionToken: String) {
+    it.property("sessionToken", sessionToken)
+  }
+
   public fun trustAllCertificates(trustAllCertificates: String) {
     it.property("trustAllCertificates", trustAllCertificates)
   }
@@ -492,4 +496,12 @@ public class Aws2S3UriDsl(
   public fun useProfileCredentialsProvider(useProfileCredentialsProvider: Boolean) {
     it.property("useProfileCredentialsProvider", useProfileCredentialsProvider.toString())
   }
+
+  public fun useSessionCredentials(useSessionCredentials: String) {
+    it.property("useSessionCredentials", useSessionCredentials)
+  }
+
+  public fun useSessionCredentials(useSessionCredentials: Boolean) {
+    it.property("useSessionCredentials", useSessionCredentials.toString())
+  }
 }
diff --git a/...camel-kotlin-api/src/generated/kotlin/org/apache/camel/kotlin/components/Aws2SesUriDsl.kt b/...camel-kotlin-api/src/generated/kotlin/org/apache/camel/kotlin/components/Aws2SesUriDsl.kt
@@ -129,6 +129,10 @@ public class Aws2SesUriDsl(
     it.property("secretKey", secretKey)
   }
 
+  public fun sessionToken(sessionToken: String) {
+    it.property("sessionToken", sessionToken)
+  }
+
   public fun trustAllCertificates(trustAllCertificates: String) {
     it.property("trustAllCertificates", trustAllCertificates)
   }
@@ -152,4 +156,12 @@ public class Aws2SesUriDsl(
   public fun useProfileCredentialsProvider(useProfileCredentialsProvider: Boolean) {
     it.property("useProfileCredentialsProvider", useProfileCredentialsProvider.toString())
   }
+
+  public fun useSessionCredentials(useSessionCredentials: String) {
+    it.property("useSessionCredentials", useSessionCredentials)
+  }
+
+  public fun useSessionCredentials(useSessionCredentials: Boolean) {
+    it.property("useSessionCredentials", useSessionCredentials.toString())
+  }
 }
diff --git a/...camel-kotlin-api/src/generated/kotlin/org/apache/camel/kotlin/components/Aws2SnsUriDsl.kt b/...camel-kotlin-api/src/generated/kotlin/org/apache/camel/kotlin/components/Aws2SnsUriDsl.kt
@@ -157,6 +157,10 @@ public class Aws2SnsUriDsl(
     it.property("secretKey", secretKey)
   }
 
+  public fun sessionToken(sessionToken: String) {
+    it.property("sessionToken", sessionToken)
+  }
+
   public fun trustAllCertificates(trustAllCertificates: String) {
     it.property("trustAllCertificates", trustAllCertificates)
   }
@@ -180,4 +184,12 @@ public class Aws2SnsUriDsl(
   public fun useProfileCredentialsProvider(useProfileCredentialsProvider: Boolean) {
     it.property("useProfileCredentialsProvider", useProfileCredentialsProvider.toString())
   }
+
+  public fun useSessionCredentials(useSessionCredentials: String) {
+    it.property("useSessionCredentials", useSessionCredentials)
+  }
+
+  public fun useSessionCredentials(useSessionCredentials: Boolean) {
+    it.property("useSessionCredentials", useSessionCredentials.toString())
+  }
 }
diff --git a/...camel-kotlin-api/src/generated/kotlin/org/apache/camel/kotlin/components/Aws2SqsUriDsl.kt b/...camel-kotlin-api/src/generated/kotlin/org/apache/camel/kotlin/components/Aws2SqsUriDsl.kt
@@ -409,6 +409,10 @@ public class Aws2SqsUriDsl(
     it.property("secretKey", secretKey)
   }
 
+  public fun sessionToken(sessionToken: String) {
+    it.property("sessionToken", sessionToken)
+  }
+
   public fun trustAllCertificates(trustAllCertificates: String) {
     it.property("trustAllCertificates", trustAllCertificates)
   }
@@ -432,4 +436,12 @@ public class Aws2SqsUriDsl(
   public fun useProfileCredentialsProvider(useProfileCredentialsProvider: Boolean) {
     it.property("useProfileCredentialsProvider", useProfileCredentialsProvider.toString())
   }
+
+  public fun useSessionCredentials(useSessionCredentials: String) {
+    it.property("useSessionCredentials", useSessionCredentials)
+  }
+
+  public fun useSessionCredentials(useSessionCredentials: Boolean) {
+    it.property("useSessionCredentials", useSessionCredentials.toString())
+  }
 }
diff --git a/dsl/camel-kotlin-api/src/generated/kotlin/org/apache/camel/kotlin/components/KafkaUriDsl.kt b/dsl/camel-kotlin-api/src/generated/kotlin/org/apache/camel/kotlin/components/KafkaUriDsl.kt
@@ -106,6 +106,14 @@ public class KafkaUriDsl(
     it.property("autoOffsetReset", autoOffsetReset)
   }
 
+  public fun batching(batching: String) {
+    it.property("batching", batching)
+  }
+
+  public fun batching(batching: Boolean) {
+    it.property("batching", batching.toString())
+  }
+
   public fun breakOnFirstError(breakOnFirstError: String) {
     it.property("breakOnFirstError", breakOnFirstError)
   }

diff --git a/...package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/AllDslKotlinMojo.java b/...package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/AllDslKotlinMojo.java
@@ -20,6 +20,9 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.lang.reflect.Field;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.net.URLClassLoader;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.ArrayList;
@@ -159,7 +162,9 @@ private void createDataFormatDsl(DataFormatModel model) throws MojoFailureExcept
         String dslClassName = pascalCaseName + "DataFormatDsl";
         Class<?> clazz;
         try {
-            clazz = Class.forName(model.getModelJavaType());
+            ClassLoader classLoader = constructClassLoaderForCamelProjects(
+                    "core/camel-core-model", "core/camel-api");
+            clazz = classLoader.loadClass(model.getModelJavaType());
         } catch (ClassNotFoundException e) {
             throw new MojoFailureException("Error while discovering class", e);
         }
@@ -456,4 +461,18 @@ private TypeName parseJavaType(String javaType) throws MojoFailureException {
             throw ex;
         }
     }
+
+    private ClassLoader constructClassLoaderForCamelProjects(String... projectPaths) throws MojoFailureException {
+        URL[] urls = new URL[projectPaths.length];
+        for (int i = 0; i < urls.length; ++i) {
+            String projectPath = projectPaths[i];
+            File buildDirectory = Path.of(baseDir.toPath().toString(), "../../", projectPath, "target/classes").toFile();
+            try {
+                urls[i] = buildDirectory.toURI().toURL();
+            } catch (MalformedURLException e) {
+                throw new RuntimeException("Error while resolving build directory of project " + projectPath, e);
+            }
+        }
+        return new URLClassLoader(urls);
+    }
 }