You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2024/07/05 05:16:50 UTC
(camel) branch main updated: CAMEL-20944: camel-jbang - Validate input file to generate rest command. Polished
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 b83745d95c7 CAMEL-20944: camel-jbang - Validate input file to generate rest command. Polished
b83745d95c7 is described below
commit b83745d95c7ded9bc791a4cd01993474337359bb
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Fri Jul 5 07:16:35 2024 +0200
CAMEL-20944: camel-jbang - Validate input file to generate rest command. Polished
---
.../camel/dsl/jbang/core/common/PluginType.java | 1 -
.../camel/dsl/jbang/core/common/Printer.java | 1 -
.../camel/dsl/jbang/core/common/RuntimeType.java | 2 +-
.../jbang/core/common/RuntimeTypeConverter.java | 2 +-
.../camel/dsl/jbang/core/common/RuntimeUtil.java | 4 +--
.../camel/dsl/jbang/core/common/YamlHelper.java | 6 +---
.../core/commands/generate/CodeRestGenerator.java | 38 ++++++++++++++++++++--
7 files changed, 41 insertions(+), 13 deletions(-)
diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/common/PluginType.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/common/PluginType.java
index 7230b9b667b..2ae71c7c190 100644
--- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/common/PluginType.java
+++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/common/PluginType.java
@@ -14,7 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.camel.dsl.jbang.core.common;
import java.util.Arrays;
diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/common/Printer.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/common/Printer.java
index 9d07be3ed14..a6323e4799f 100644
--- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/common/Printer.java
+++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/common/Printer.java
@@ -14,7 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.camel.dsl.jbang.core.common;
/**
diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/common/RuntimeType.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/common/RuntimeType.java
index a51b96b2881..9caac92538a 100644
--- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/common/RuntimeType.java
+++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/common/RuntimeType.java
@@ -14,12 +14,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.camel.dsl.jbang.core.common;
import org.apache.camel.catalog.DefaultCamelCatalog;
public enum RuntimeType {
+
springBoot,
quarkus,
main;
diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/common/RuntimeTypeConverter.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/common/RuntimeTypeConverter.java
index e2784ef7f05..3ab717e9cc6 100644
--- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/common/RuntimeTypeConverter.java
+++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/common/RuntimeTypeConverter.java
@@ -14,12 +14,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.camel.dsl.jbang.core.common;
import picocli.CommandLine;
public class RuntimeTypeConverter implements CommandLine.ITypeConverter<RuntimeType> {
+
public RuntimeType convert(String value) throws Exception {
return RuntimeType.fromValue(value);
}
diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/common/RuntimeUtil.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/common/RuntimeUtil.java
index ca44f91652a..8d505eb5bec 100644
--- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/common/RuntimeUtil.java
+++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/common/RuntimeUtil.java
@@ -174,10 +174,10 @@ public final class RuntimeUtil {
String deps = properties != null ? properties.getProperty("camel.jbang.dependencies") : null;
if (deps != null) {
deps = deps.trim();
- if (deps.length() > 0 && deps.charAt(0) == ',') {
+ if (!deps.isEmpty() && deps.charAt(0) == ',') {
deps = deps.substring(1);
}
- if (deps.length() > 0 && deps.charAt(deps.length() - 1) == ',') {
+ if (!deps.isEmpty() && deps.charAt(deps.length() - 1) == ',') {
deps = deps.substring(0, deps.lastIndexOf(","));
}
} else {
diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/common/YamlHelper.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/common/YamlHelper.java
index db408c40a13..ee0b5ecd8f4 100644
--- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/common/YamlHelper.java
+++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/common/YamlHelper.java
@@ -14,7 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.camel.dsl.jbang.core.common;
import java.util.Collection;
@@ -35,8 +34,6 @@ public final class YamlHelper {
/**
* Creates new Yaml instance. The implementation provided by Snakeyaml is not thread-safe. It is better to create a
* fresh instance for every YAML stream.
- *
- * @return
*/
public static Yaml yaml() {
Representer representer = new Representer(new DumperOptions()) {
@@ -45,8 +42,7 @@ public final class YamlHelper {
Object javaBean, Property property, Object propertyValue, Tag customTag) {
// if value of property is null, ignore it.
if (propertyValue == null || (propertyValue instanceof Collection && ((Collection<?>) propertyValue).isEmpty())
- ||
- (propertyValue instanceof Map && ((Map<?, ?>) propertyValue).isEmpty())) {
+ || (propertyValue instanceof Map && ((Map<?, ?>) propertyValue).isEmpty())) {
return null;
} else {
return super.representJavaBeanProperty(javaBean, property, propertyValue, customTag);
diff --git a/dsl/camel-jbang/camel-jbang-plugin-generate/src/main/java/org/apache/camel/dsl/jbang/core/commands/generate/CodeRestGenerator.java b/dsl/camel-jbang/camel-jbang-plugin-generate/src/main/java/org/apache/camel/dsl/jbang/core/commands/generate/CodeRestGenerator.java
index 173f42069ae..07d6df6cb4e 100644
--- a/dsl/camel-jbang/camel-jbang-plugin-generate/src/main/java/org/apache/camel/dsl/jbang/core/commands/generate/CodeRestGenerator.java
+++ b/dsl/camel-jbang/camel-jbang-plugin-generate/src/main/java/org/apache/camel/dsl/jbang/core/commands/generate/CodeRestGenerator.java
@@ -20,6 +20,8 @@ import java.io.File;
import java.io.IOException;
import java.nio.file.Files;
import java.nio.file.Paths;
+import java.util.Iterator;
+import java.util.List;
import java.util.Map;
import io.swagger.v3.oas.models.OpenAPI;
@@ -45,11 +47,36 @@ import static org.openapitools.codegen.CodegenConstants.SERIALIZABLE_MODEL;
@CommandLine.Command(name = "rest", description = "Generate REST DSL source code from OpenApi specification")
public class CodeRestGenerator extends CamelCommand {
+ public static class OpenApiVersionCompletionCandidates implements Iterable<String> {
+
+ public OpenApiVersionCompletionCandidates() {
+ }
+
+ @Override
+ public Iterator<String> iterator() {
+ return List.of("3.0", "3.1").iterator();
+ }
+
+ }
+
+ public static class OpenApiTypeCompletionCandidates implements Iterable<String> {
+
+ public OpenApiTypeCompletionCandidates() {
+ }
+
+ @Override
+ public Iterator<String> iterator() {
+ return List.of("xml", "yaml").iterator();
+ }
+
+ }
+
@CommandLine.Option(names = { "--input" }, required = true, description = "OpenApi specification file name")
private String input;
@CommandLine.Option(names = { "--output" }, description = "Output REST DSL file name")
private String output;
- @CommandLine.Option(names = { "--type" }, description = "REST DSL type (YAML or XML)", defaultValue = "yaml")
+ @CommandLine.Option(names = { "--type" }, description = "REST DSL type (YAML or XML)", defaultValue = "yaml",
+ completionCandidates = OpenApiTypeCompletionCandidates.class)
private String type;
@CommandLine.Option(names = { "--routes" }, description = "Generate routes (only in YAML)")
private boolean generateRoutes;
@@ -65,7 +92,7 @@ public class CodeRestGenerator extends CamelCommand {
defaultValue = "model")
private String packageName;
@CommandLine.Option(names = { "--openapi-version" }, description = "Openapi specification 3.0 or 3.1",
- defaultValue = "3.0")
+ defaultValue = "3.0", completionCandidates = OpenApiVersionCompletionCandidates.class)
private String openApiVersion = "3.0";
public CodeRestGenerator(CamelJBangMain main) {
@@ -74,6 +101,13 @@ public class CodeRestGenerator extends CamelCommand {
@Override
public Integer doCall() throws Exception {
+ // validate that the input file exists
+ File f = new File(input);
+ if (!f.exists() && !f.isFile()) {
+ printer().println("Error: Input file " + input + " does not exist");
+ return 1;
+ }
+
OpenAPI doc;
OpenAPIV3Parser parser = new OpenAPIV3Parser();