This is an automated email from the ASF dual-hosted git repository.
marat pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-karavan.git
commit 37d10cbc6d697078674aef3102abed30dd64865d
Author: Marat Gubaidullin <ma...@talismancloud.io>
AuthorDate: Wed Apr 10 16:13:37 2024 -0400
Upgrade generator for 4.5.0
---
karavan-generator/dependency-reduced-pom.xml | 15 +++++----
karavan-generator/pom.xml | 4 +--
.../camel/karavan/generator/AbstractGenerator.java | 39 ++++++++++++++++++----
3 files changed, 43 insertions(+), 15 deletions(-)
diff --git a/karavan-generator/dependency-reduced-pom.xml
b/karavan-generator/dependency-reduced-pom.xml
index ac053c02..f5e24a2d 100644
--- a/karavan-generator/dependency-reduced-pom.xml
+++ b/karavan-generator/dependency-reduced-pom.xml
@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.camel.karavan</groupId>
<artifactId>karavan-generator</artifactId>
- <version>3.20.1-SNAPSHOT</version>
+ <version>4.4.1</version>
<build>
<resources>
<resource>
@@ -61,15 +61,16 @@
</repository>
</repositories>
<properties>
- <maven.compiler.source>11</maven.compiler.source>
- <version.camel-kamelet>3.20.1.1</version.camel-kamelet>
+ <version.camel-kamelet>4.5.0</version.camel-kamelet>
<compiler-plugin.version>3.8.1</compiler-plugin.version>
- <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
- <version.vertx>4.3.6</version.vertx>
+ <version.vertx>4.5.3</version.vertx>
<surefire-plugin.version>3.0.0-M5</surefire-plugin.version>
- <maven.compiler.target>11</maven.compiler.target>
- <version.camel-core>3.20.2</version.camel-core>
+ <version.camel-core>4.5.0</version.camel-core>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.parameters>true</maven.compiler.parameters>
+ <maven.compiler.source>17</maven.compiler.source>
+ <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+ <maven.compiler.target>17</maven.compiler.target>
+ <camel.k.extension.version>6.7.2</camel.k.extension.version>
</properties>
</project>
diff --git a/karavan-generator/pom.xml b/karavan-generator/pom.xml
index 496f71d6..93e86d4d 100644
--- a/karavan-generator/pom.xml
+++ b/karavan-generator/pom.xml
@@ -28,8 +28,8 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<surefire-plugin.version>3.0.0-M5</surefire-plugin.version>
- <version.camel-core>4.4.1</version.camel-core>
- <version.camel-kamelet>4.4.1</version.camel-kamelet>
+ <version.camel-core>4.5.0</version.camel-core>
+ <version.camel-kamelet>4.5.0</version.camel-kamelet>
<camel.k.extension.version>6.7.2</camel.k.extension.version>
<version.vertx>4.5.3</version.vertx>
</properties>
diff --git
a/karavan-generator/src/main/java/org/apache/camel/karavan/generator/AbstractGenerator.java
b/karavan-generator/src/main/java/org/apache/camel/karavan/generator/AbstractGenerator.java
index 2b36d07a..cc83d878 100644
---
a/karavan-generator/src/main/java/org/apache/camel/karavan/generator/AbstractGenerator.java
+++
b/karavan-generator/src/main/java/org/apache/camel/karavan/generator/AbstractGenerator.java
@@ -22,6 +22,9 @@ import io.vertx.core.json.JsonArray;
import io.vertx.core.json.JsonObject;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.catalog.CamelCatalog;
+import org.apache.camel.catalog.ConfigurationPropertiesValidationResult;
+import org.apache.camel.catalog.DefaultCamelCatalog;
+import org.apache.camel.catalog.VersionHelper;
import org.apache.camel.dsl.yaml.YamlRoutesBuilderLoader;
import java.io.BufferedReader;
@@ -30,10 +33,9 @@ import java.io.File;
import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.nio.file.StandardCopyOption;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.nio.file.*;
import java.util.*;
import java.util.logging.Logger;
import java.util.stream.Collectors;
@@ -380,7 +382,7 @@ public class AbstractGenerator {
protected String getMetaDataFormat(String name) {
try {
- InputStream inputStream =
RouteBuilder.class.getResourceAsStream("/org/apache/camel/model/dataformat/" +
name + ".json");
+ InputStream inputStream =
VersionHelper.class.getResourceAsStream("/org/apache/camel/catalog/models/" +
name + ".json");
String data = new BufferedReader(new
InputStreamReader(inputStream))
.lines().collect(Collectors.joining(System.getProperty("line.separator")));
return data;
@@ -389,9 +391,34 @@ public class AbstractGenerator {
}
}
+ protected List<String> listResources(String resourceFolder) {
+ List<Path> filePaths = new ArrayList<>();
+ try {
+ URI uri = VersionHelper.class.getResource(resourceFolder).toURI();
+ Path myPath;
+ FileSystem fileSystem = null;
+ if (uri.getScheme().equals("jar")) {
+ fileSystem = FileSystems.newFileSystem(uri,
Collections.emptyMap());
+ myPath = fileSystem.getPath(resourceFolder);
+ } else {
+ myPath = Paths.get(uri);
+ }
+ filePaths = Files.walk(myPath, 10).collect(Collectors.toList());
+
+ // Close the file system if opened
+ if (fileSystem != null) {
+ fileSystem.close();
+ }
+ } catch (URISyntaxException | IOException e) {
+ e.printStackTrace();
+ }
+ return filePaths.stream().map(path -> path.getFileName().toString())
+ .collect(Collectors.toList());
+ }
+
protected String getMetaLanguage(String name) {
try {
- InputStream inputStream =
RouteBuilder.class.getResourceAsStream("/org/apache/camel/model/language/" +
name + ".json");
+ InputStream inputStream =
VersionHelper.class.getResourceAsStream("/org/apache/camel/catalog/models/" +
name + ".json");
String data = new BufferedReader(new
InputStreamReader(inputStream))
.lines().collect(Collectors.joining(System.getProperty("line.separator")));
return data;
