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 2021/10/21 08:27:55 UTC

[camel-spring-boot] branch main updated (df337b7 -> 84faea6)

This is an automated email from the ASF dual-hosted git repository.

davsclaus pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git.


    from df337b7  Regen
     new 334f75a  CAMEL-16934: camel-swagger-java and camel-openapi-java - Removed support for rendering API DOCs from other CamelContext discovered in the same JVM via JMX.
     new 84faea6  CAMEL-16934: camel-swagger-java and camel-openapi-java - Removed support for rendering API DOCs from other CamelContext discovered in the same JVM via JMX.

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:
 .../springboot/catalog/components/rest-api.json    |  1 -
 .../camel-core-starter/src/main/docs/core.json     | 30 ++++++++++++----------
 .../RestConfigurationDefinitionProperties.java     |  6 +++++
 3 files changed, 23 insertions(+), 14 deletions(-)

[camel-spring-boot] 02/02: CAMEL-16934: camel-swagger-java and camel-openapi-java - Removed support for rendering API DOCs from other CamelContext discovered in the same JVM via JMX.

Posted by da...@apache.org.
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-spring-boot.git

commit 84faea6254f9cf73b42e1b2c143743332a962182
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Thu Oct 21 10:27:46 2021 +0200

    CAMEL-16934: camel-swagger-java and camel-openapi-java - Removed support for rendering API DOCs from other CamelContext discovered in the same JVM via JMX.
---
 .../camel-core-starter/src/main/docs/core.json     | 30 ++++++++++++----------
 .../RestConfigurationDefinitionProperties.java     |  6 +++++
 2 files changed, 23 insertions(+), 13 deletions(-)

diff --git a/components-starter/camel-core-starter/src/main/docs/core.json b/components-starter/camel-core-starter/src/main/docs/core.json
index 3d7c7d0..3bafdd5 100644
--- a/components-starter/camel-core-starter/src/main/docs/core.json
+++ b/components-starter/camel-core-starter/src/main/docs/core.json
@@ -951,19 +951,6 @@
       "sourceType": "org.apache.camel.model.rest.springboot.RestConfigurationDefinitionProperties"
     },
     {
-      "name": "camel.rest.api-context-id-pattern",
-      "type": "java.lang.String",
-      "description": "Sets an CamelContext id pattern to only allow Rest APIs from rest services within CamelContext's which name matches the pattern. The pattern #name# refers to the CamelContext name, to match on the current CamelContext only. For any other value, the pattern uses the rules from PatternHelper#matchPattern(String,String)",
-      "sourceType": "org.apache.camel.model.rest.springboot.RestConfigurationDefinitionProperties"
-    },
-    {
-      "name": "camel.rest.api-context-listing",
-      "type": "java.lang.Boolean",
-      "description": "Sets whether listing of all available CamelContext's with REST services in the JVM is enabled. If enabled it allows to discover these contexts, if false then only the current CamelContext is in use.",
-      "sourceType": "org.apache.camel.model.rest.springboot.RestConfigurationDefinitionProperties",
-      "defaultValue": false
-    },
-    {
       "name": "camel.rest.api-context-path",
       "type": "java.lang.String",
       "description": "Sets a leading API context-path the REST API services will be using. This can be used when using components such as camel-servlet where the deployed web application is deployed using a context-path.",
@@ -1117,6 +1104,23 @@
       "type": "java.lang.String",
       "description": "Name of specific XML data format to use. By default jaxb will be used. Important: This option is only for setting a custom name of the data format, not to refer to an existing data format instance.",
       "sourceType": "org.apache.camel.model.rest.springboot.RestConfigurationDefinitionProperties"
+    },
+    {
+      "name": "camel.rest.api-context-id-pattern",
+      "type": "java.lang.String",
+      "description": "Sets an CamelContext id pattern to only allow Rest APIs from rest services within CamelContext's which name matches the pattern. The pattern #name# refers to the CamelContext name, to match on the current CamelContext only. For any other value, the pattern uses the rules from PatternHelper#matchPattern(String,String)",
+      "sourceType": "org.apache.camel.model.rest.springboot.RestConfigurationDefinitionProperties",
+      "deprecated": true,
+      "deprecation": {}
+    },
+    {
+      "name": "camel.rest.api-context-listing",
+      "type": "java.lang.Boolean",
+      "description": "Sets whether listing of all available CamelContext's with REST services in the JVM is enabled. If enabled it allows to discover these contexts, if false then only the current CamelContext is in use.",
+      "sourceType": "org.apache.camel.model.rest.springboot.RestConfigurationDefinitionProperties",
+      "defaultValue": false,
+      "deprecated": true,
+      "deprecation": {}
     }
   ],
   "hints": []
diff --git a/components-starter/camel-core-starter/src/main/java/org/apache/camel/model/rest/springboot/RestConfigurationDefinitionProperties.java b/components-starter/camel-core-starter/src/main/java/org/apache/camel/model/rest/springboot/RestConfigurationDefinitionProperties.java
index 9cfc4e8..0034380 100644
--- a/components-starter/camel-core-starter/src/main/java/org/apache/camel/model/rest/springboot/RestConfigurationDefinitionProperties.java
+++ b/components-starter/camel-core-starter/src/main/java/org/apache/camel/model/rest/springboot/RestConfigurationDefinitionProperties.java
@@ -119,12 +119,14 @@ public class RestConfigurationDefinitionProperties {
      * CamelContext only. For any other value, the pattern uses the rules from
      * PatternHelper#matchPattern(String,String)
      */
+    @Deprecated
     private String apiContextIdPattern;
     /**
      * Sets whether listing of all available CamelContext's with REST services
      * in the JVM is enabled. If enabled it allows to discover these contexts,
      * if false then only the current CamelContext is in use.
      */
+    @Deprecated
     private Boolean apiContextListing = false;
     /**
      * Whether vendor extension is enabled in the Rest APIs. If enabled then
@@ -306,18 +308,22 @@ public class RestConfigurationDefinitionProperties {
         this.apiContextRouteId = apiContextRouteId;
     }
 
+    @Deprecated
     public String getApiContextIdPattern() {
         return apiContextIdPattern;
     }
 
+    @Deprecated
     public void setApiContextIdPattern(String apiContextIdPattern) {
         this.apiContextIdPattern = apiContextIdPattern;
     }
 
+    @Deprecated
     public Boolean getApiContextListing() {
         return apiContextListing;
     }
 
+    @Deprecated
     public void setApiContextListing(Boolean apiContextListing) {
         this.apiContextListing = apiContextListing;
     }

[camel-spring-boot] 01/02: CAMEL-16934: camel-swagger-java and camel-openapi-java - Removed support for rendering API DOCs from other CamelContext discovered in the same JVM via JMX.

Posted by da...@apache.org.
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-spring-boot.git

commit 334f75ae408a194ac557713d28f238d233e21831
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Thu Oct 21 10:25:30 2021 +0200

    CAMEL-16934: camel-swagger-java and camel-openapi-java - Removed support for rendering API DOCs from other CamelContext discovered in the same JVM via JMX.
---
 .../org/apache/camel/springboot/catalog/components/rest-api.json         | 1 -
 1 file changed, 1 deletion(-)

diff --git a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/rest-api.json b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/rest-api.json
index f379eb5..825bc6e 100644
--- a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/rest-api.json
+++ b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/rest-api.json
@@ -27,7 +27,6 @@
   },
   "properties": {
     "path": { "kind": "path", "displayName": "Path", "group": "consumer", "label": "", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The base path" },
-    "contextIdPattern": { "kind": "path", "displayName": "Context Id Pattern", "group": "consumer", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Optional CamelContext id pattern to only allow Rest APIs from rest services within CamelContext's which name matches the pattern." },
     "apiComponentName": { "kind": "parameter", "displayName": "Api Component Name", "group": "consumer", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "The Camel Rest API component to use for generating the API of the REST services, such as openapi." },
     "bridgeErrorHandler": { "kind": "parameter", "displayName": "Bridge Error Handler", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a m [...]
     "consumerComponentName": { "kind": "parameter", "displayName": "Consumer Component Name", "group": "consumer", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "The Camel Rest component to use for (consumer) the REST transport, such as jetty, servlet, undertow. If no component has been explicit configured, then Camel will lookup if there is a Camel component that integrates with  [...]