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 2022/12/10 09:57:35 UTC
[camel] branch main updated: camel-jbang - Add catalog have since column which also can be filtered.
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 964484d00e5 camel-jbang - Add catalog have since column which also can be filtered.
964484d00e5 is described below
commit 964484d00e54a005be3451aed60076ef5a7752d7
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Sat Dec 10 10:56:46 2022 +0100
camel-jbang - Add catalog have since column which also can be filtered.
---
.../core/commands/catalog/CatalogBaseCommand.java | 32 ++++++++++--
.../core/commands/catalog/CatalogComponent.java | 1 +
.../core/commands/catalog/CatalogDataFormat.java | 1 +
.../core/commands/catalog/CatalogLanguage.java | 1 +
.../jbang/core/commands/catalog/VersionHelper.java | 59 ++++++++++++++++++++++
5 files changed, 89 insertions(+), 5 deletions(-)
diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/catalog/CatalogBaseCommand.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/catalog/CatalogBaseCommand.java
index e5cdf93b606..448bba7a364 100644
--- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/catalog/CatalogBaseCommand.java
+++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/catalog/CatalogBaseCommand.java
@@ -46,6 +46,14 @@ public abstract class CatalogBaseCommand extends CamelCommand {
description = "Filter by name or description")
String filterName;
+ @CommandLine.Option(names = { "--since-before" },
+ description = "Filter by version older (inclusive)")
+ String sinceBefore;
+
+ @CommandLine.Option(names = { "--since-after" },
+ description = "Filter by version more recent (inclusive)")
+ String sinceAfter;
+
final CamelCatalog catalog = new DefaultCamelCatalog(true);
public CatalogBaseCommand(CamelJBangMain main) {
@@ -64,9 +72,21 @@ public abstract class CatalogBaseCommand extends CamelCommand {
if (filterName != null) {
filterName = filterName.toLowerCase(Locale.ROOT);
- rows = rows.stream().filter(
- r -> r.name.equalsIgnoreCase(filterName) || r.description.toLowerCase(Locale.ROOT).contains(filterName)
- || r.label.toLowerCase(Locale.ROOT).contains(filterName))
+ rows = rows.stream()
+ .filter(
+ r -> r.name.equalsIgnoreCase(filterName)
+ || r.description.toLowerCase(Locale.ROOT).contains(filterName)
+ || r.label.toLowerCase(Locale.ROOT).contains(filterName))
+ .collect(Collectors.toList());
+ }
+ if (sinceBefore != null) {
+ rows = rows.stream()
+ .filter(r -> VersionHelper.isGE(sinceBefore, r.since))
+ .collect(Collectors.toList());
+ }
+ if (sinceAfter != null) {
+ rows = rows.stream()
+ .filter(r -> VersionHelper.isGE(r.since, sinceAfter))
.collect(Collectors.toList());
}
@@ -75,9 +95,10 @@ public abstract class CatalogBaseCommand extends CamelCommand {
if (!rows.isEmpty()) {
System.out.println(AsciiTable.getTable(AsciiTable.NO_BORDERS, rows, Arrays.asList(
- new Column().header("NAME").visible(!gav).dataAlign(HorizontalAlign.LEFT).with(r -> r.name),
+ new Column().header("NAME").visible(!gav).dataAlign(HorizontalAlign.LEFT).maxWidth(30).with(r -> r.name),
new Column().header("ARTIFACT-ID").visible(gav).dataAlign(HorizontalAlign.LEFT).with(this::shortGav),
- new Column().header("LEVEL").dataAlign(HorizontalAlign.LEFT).minWidth(12).with(r -> r.level),
+ new Column().header("LEVEL").dataAlign(HorizontalAlign.LEFT).with(r -> r.level),
+ new Column().header("SINCE").dataAlign(HorizontalAlign.RIGHT).with(r -> r.since),
new Column().header("DESCRIPTION").dataAlign(HorizontalAlign.LEFT).with(this::shortDescription))));
}
@@ -121,6 +142,7 @@ public abstract class CatalogBaseCommand extends CamelCommand {
String name;
String title;
String level;
+ String since;
String description;
String label;
String gav;
diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/catalog/CatalogComponent.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/catalog/CatalogComponent.java
index 0fa86912451..a2c30ada5be 100644
--- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/catalog/CatalogComponent.java
+++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/catalog/CatalogComponent.java
@@ -40,6 +40,7 @@ public class CatalogComponent extends CatalogBaseCommand {
row.name = model.getScheme();
row.title = model.getTitle();
row.level = model.getSupportLevel().name();
+ row.since = model.getFirstVersionShort();
row.description = model.getDescription();
row.label = model.getLabel() != null ? model.getLabel() : "";
row.deprecated = model.isDeprecated();
diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/catalog/CatalogDataFormat.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/catalog/CatalogDataFormat.java
index a264480a3da..9f254c386be 100644
--- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/catalog/CatalogDataFormat.java
+++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/catalog/CatalogDataFormat.java
@@ -40,6 +40,7 @@ public class CatalogDataFormat extends CatalogBaseCommand {
row.name = model.getName();
row.title = model.getTitle();
row.level = model.getSupportLevel().name();
+ row.since = model.getFirstVersionShort();
row.description = model.getDescription();
row.label = model.getLabel() != null ? model.getLabel() : "";
row.deprecated = model.isDeprecated();
diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/catalog/CatalogLanguage.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/catalog/CatalogLanguage.java
index 1bf1b8685e9..d6a22346349 100644
--- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/catalog/CatalogLanguage.java
+++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/catalog/CatalogLanguage.java
@@ -40,6 +40,7 @@ public class CatalogLanguage extends CatalogBaseCommand {
row.name = model.getName();
row.title = model.getTitle();
row.level = model.getSupportLevel().name();
+ row.since = model.getFirstVersionShort();
row.description = model.getDescription();
row.label = model.getLabel() != null ? model.getLabel() : "";
row.deprecated = model.isDeprecated();
diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/catalog/VersionHelper.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/catalog/VersionHelper.java
new file mode 100644
index 00000000000..20985ddf161
--- /dev/null
+++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/catalog/VersionHelper.java
@@ -0,0 +1,59 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.dsl.jbang.core.commands.catalog;
+
+import org.apache.camel.util.StringHelper;
+
+final class VersionHelper {
+
+ private VersionHelper() {
+ }
+
+ public static boolean isGE(String source, String target) {
+ String s1 = StringHelper.before(source, ".");
+ String s2 = StringHelper.after(source, ".");
+ if (s1 == null) {
+ s1 = StringHelper.before(source, ",");
+ s2 = StringHelper.after(source, ",");
+ }
+ String t1 = StringHelper.before(target, ".");
+ String t2 = StringHelper.after(target, ".");
+ if (t1 == null) {
+ t1 = StringHelper.before(target, ",");
+ t2 = StringHelper.after(target, ",");
+ }
+
+ // convert to 2-digit numbers
+ if (s1.length() < 2) {
+ s1 = "0" + s1;
+ }
+ if (s2.length() < 2) {
+ s2 = "0" + s2;
+ }
+ if (t1.length() < 2) {
+ t1 = "0" + t1;
+ }
+ if (t2.length() < 2) {
+ t2 = "0" + t2;
+ }
+
+ String s = s1 + s2;
+ String t = t1 + t2;
+ int n = s.compareTo(t);
+ return n >= 0;
+ }
+}