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 2020/07/27 08:24:52 UTC
[camel] branch master updated (9f13bf9 -> 2446554)
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git.
from 9f13bf9 Update github labels
new 9d2dd70 Add api on camel catalog for main model.
new 2446554 Regen
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../resources/org/apache/camel/catalog/docs/jsonata-component.adoc | 2 +-
.../src/main/java/org/apache/camel/catalog/CamelCatalog.java | 6 ++++++
.../src/main/java/org/apache/camel/catalog/DefaultCamelCatalog.java | 1 +
3 files changed, 8 insertions(+), 1 deletion(-)
[camel] 01/02: Add api on camel catalog for main model.
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 9d2dd709bd1c48d0236a613245512835a87a3a44
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Mon Jul 27 10:24:07 2020 +0200
Add api on camel catalog for main model.
---
.../src/main/java/org/apache/camel/catalog/CamelCatalog.java | 6 ++++++
.../src/main/java/org/apache/camel/catalog/DefaultCamelCatalog.java | 1 +
2 files changed, 7 insertions(+)
diff --git a/catalog/camel-catalog/src/main/java/org/apache/camel/catalog/CamelCatalog.java b/catalog/camel-catalog/src/main/java/org/apache/camel/catalog/CamelCatalog.java
index f1361a8..014e7be 100644
--- a/catalog/camel-catalog/src/main/java/org/apache/camel/catalog/CamelCatalog.java
+++ b/catalog/camel-catalog/src/main/java/org/apache/camel/catalog/CamelCatalog.java
@@ -26,6 +26,7 @@ import org.apache.camel.tooling.model.ComponentModel;
import org.apache.camel.tooling.model.DataFormatModel;
import org.apache.camel.tooling.model.EipModel;
import org.apache.camel.tooling.model.LanguageModel;
+import org.apache.camel.tooling.model.MainModel;
import org.apache.camel.tooling.model.OtherModel;
/**
@@ -590,6 +591,11 @@ public interface CamelCatalog {
EipModel eipModel(String name);
/**
+ * @return the requested main model or {@code null} in case it is not available in this {@link CamelCatalog}
+ */
+ MainModel mainModel();
+
+ /**
* @param kind the requested kind
* @param name the name to look up
* @return the requested model or {@code null} in case it is not available in this {@link CamelCatalog}
diff --git a/catalog/camel-catalog/src/main/java/org/apache/camel/catalog/DefaultCamelCatalog.java b/catalog/camel-catalog/src/main/java/org/apache/camel/catalog/DefaultCamelCatalog.java
index 44aa1b1..c445ee3 100644
--- a/catalog/camel-catalog/src/main/java/org/apache/camel/catalog/DefaultCamelCatalog.java
+++ b/catalog/camel-catalog/src/main/java/org/apache/camel/catalog/DefaultCamelCatalog.java
@@ -348,6 +348,7 @@ public class DefaultCamelCatalog extends AbstractCamelCatalog implements CamelCa
return cache("main", "main", k -> super.mainJSonSchema());
}
+ @Override
public MainModel mainModel() {
return cache("main-model", "main-model", k -> super.mainModel());
}
[camel] 02/02: Regen
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 24465540732342cbecff9f162d57b9271a8ef809
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Mon Jul 27 10:24:13 2020 +0200
Regen
---
.../resources/org/apache/camel/catalog/docs/jsonata-component.adoc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/jsonata-component.adoc b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/jsonata-component.adoc
index b3fa011..8992a2c 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/jsonata-component.adoc
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/jsonata-component.adoc
@@ -121,4 +121,4 @@ from("activemq:My.Queue").
-include::camel-spring-boot::page$jsonata-component.adoc[]
+include::camel-spring-boot::page$jsonata-starter.adoc[]