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
The following commit(s) were added to refs/heads/master by this push: new 3e30f5a Remove deprecated options from camel-spring-boot 3e30f5a is described below commit 3e30f5a456c46e966d265d56820c6bf217c40686 Author: Claus Ibsen <claus.ib...@gmail.com> AuthorDate: Tue Jun 4 10:30:52 2019 +0200 Remove deprecated options from camel-spring-boot --- .../src/main/docs/spring-boot.adoc | 4 +-- .../spring/boot/CamelConfigurationProperties.java | 34 ---------------------- 2 files changed, 1 insertion(+), 37 deletions(-) diff --git a/components/camel-spring-boot/src/main/docs/spring-boot.adoc b/components/camel-spring-boot/src/main/docs/spring-boot.adoc index fc7e71b..8218937 100644 --- a/components/camel-spring-boot/src/main/docs/spring-boot.adoc +++ b/components/camel-spring-boot/src/main/docs/spring-boot.adoc @@ -91,7 +91,7 @@ When using Spring Boot make sure to use the following Maven dependency to have s ---- -The component supports 142 options, which are listed below. +The component supports 140 options, which are listed below. @@ -238,8 +238,6 @@ The component supports 142 options, which are listed below. | *management.endpoint.camelroutes.read-only* | Whether Camel Routes actuator is in read-only mode. If not in read-only mode then operations to start/stop routes would be enabled. | true | Boolean | *management.info.camel.enabled* | Whether to enable Camel info. | true | Boolean | *management.info.camel.verbose* | Global option to enable/disable health bean camel version info, default is true. | true | Boolean -| *camel.springboot.stream-caching* | Sets whether stream caching is enabled or not (deprecated use stream-caching-enabled instead). Default is false. | false | Boolean -| *camel.springboot.use-m-d-c-logging* | To turn on MDC logging (deprecated use use-mdc-logging instead) | false | Boolean |=== // spring-boot-auto-configure options: END diff --git a/components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/CamelConfigurationProperties.java b/components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/CamelConfigurationProperties.java index eb01bb9..1e87c32f 100644 --- a/components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/CamelConfigurationProperties.java +++ b/components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/CamelConfigurationProperties.java @@ -238,14 +238,6 @@ public class CamelConfigurationProperties { private int logDebugMaxChars; /** - * Sets whether stream caching is enabled or not (deprecated use stream-caching-enabled instead). - * - * Default is false. - */ - @Deprecated - private boolean streamCaching; - - /** * Sets whether stream caching is enabled or not. * * Default is false. @@ -481,12 +473,6 @@ public class CamelConfigurationProperties { private Integer tracerFormatterMaxChars = 10000; /** - * To turn on MDC logging (deprecated use use-mdc-logging instead) - */ - @Deprecated - private boolean useMDCLogging; - - /** * To turn on MDC logging */ private boolean useMdcLogging; @@ -674,16 +660,6 @@ public class CamelConfigurationProperties { this.logDebugMaxChars = logDebugMaxChars; } - @Deprecated - public boolean isStreamCaching() { - return streamCachingEnabled; - } - - @Deprecated - public void setStreamCaching(boolean streamCaching) { - this.streamCachingEnabled = streamCaching; - } - public boolean isStreamCachingEnabled() { return streamCachingEnabled; } @@ -1012,16 +988,6 @@ public class CamelConfigurationProperties { this.includeNonSingletons = includeNonSingletons; } - @Deprecated - public boolean isUseMDCLogging() { - return isUseMdcLogging(); - } - - @Deprecated - public void setUseMDCLogging(boolean useMDCLogging) { - setUseMdcLogging(useMDCLogging); - } - public boolean isUseMdcLogging() { return useMdcLogging; }