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 2018/01/21 11:44:23 UTC

[camel] 01/02: CAMEL-12165: Fixed CS

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 6ce148dc3195d40226551b9481eea4fe779b7258
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Sun Jan 21 12:40:05 2018 +0100

    CAMEL-12165: Fixed CS
---
 .../main/java/org/apache/camel/model/dataformat/JaxbDataFormat.java | 4 ++--
 components/camel-jaxb/src/main/docs/jaxb-dataformat.adoc            | 2 +-
 .../converter/jaxb/springboot/JaxbDataFormatConfiguration.java      | 6 +++---
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/camel-core/src/main/java/org/apache/camel/model/dataformat/JaxbDataFormat.java b/camel-core/src/main/java/org/apache/camel/model/dataformat/JaxbDataFormat.java
index bd4c26a..82cc368 100644
--- a/camel-core/src/main/java/org/apache/camel/model/dataformat/JaxbDataFormat.java
+++ b/camel-core/src/main/java/org/apache/camel/model/dataformat/JaxbDataFormat.java
@@ -115,8 +115,8 @@ public class JaxbDataFormat extends DataFormatDefinition {
     /**
      * Sets the schema severity level to use when validating against a schema.
      * This level determines the minimum severity error that triggers JAXB to stop continue parsing.
-     * The default value of 0 (WARNING) means that any error (WARNING, ERROR or FATAL ERROR) will trigger
-     * JAXB to stop. There are the following three levels: 0=WARNING, 1=ERROR, 2=FATAL ERROR.
+     * The default value of 0 (warning) means that any error (warning, error or fatal error) will trigger
+     * JAXB to stop. There are the following three levels: 0=warning, 1=error, 2=fatal error.
      */
     public void setSchemaSeverityLevel(Integer schemaSeverityLevel) {
         this.schemaSeverityLevel = schemaSeverityLevel;
diff --git a/components/camel-jaxb/src/main/docs/jaxb-dataformat.adoc b/components/camel-jaxb/src/main/docs/jaxb-dataformat.adoc
index 82fcdd1..f02ea7a 100644
--- a/components/camel-jaxb/src/main/docs/jaxb-dataformat.adoc
+++ b/components/camel-jaxb/src/main/docs/jaxb-dataformat.adoc
@@ -19,7 +19,7 @@ The JAXB dataformat supports 18 options which are listed below.
 | Name | Default | Java Type | Description
 | contextPath |  | String | Package name where your JAXB classes are located.
 | schema |  | String | To validate against an existing schema. Your can use the prefix classpath: file: or http: to specify how the resource should by resolved. You can separate multiple schema files by using the '' character.
-| schemaSeverityLevel | 0 | Integer | Sets the schema severity level to use when validating against a schema. This level determines the minimum severity error that triggers JAXB to stop continue parsing. The default value of 0 (WARNING) means that any error (WARNING ERROR or FATAL ERROR) will trigger JAXB to stop. There are the following three levels: 0=WARNING 1=ERROR 2=FATAL ERROR.
+| schemaSeverityLevel | 0 | Integer | Sets the schema severity level to use when validating against a schema. This level determines the minimum severity error that triggers JAXB to stop continue parsing. The default value of 0 (warning) means that any error (warning error or fatal error) will trigger JAXB to stop. There are the following three levels: 0=warning 1=error 2=fatal error.
 | prettyPrint | false | Boolean | To enable pretty printing output nicely formatted. Is by default false.
 | objectFactory | false | Boolean | Whether to allow using ObjectFactory classes to create the POJO classes during marshalling. This only applies to POJO classes that has not been annotated with JAXB and providing jaxb.index descriptor files.
 | ignoreJAXBElement | false | Boolean | Whether to ignore JAXBElement elements - only needed to be set to false in very special use-cases.
diff --git a/platforms/spring-boot/components-starter/camel-jaxb-starter/src/main/java/org/apache/camel/converter/jaxb/springboot/JaxbDataFormatConfiguration.java b/platforms/spring-boot/components-starter/camel-jaxb-starter/src/main/java/org/apache/camel/converter/jaxb/springboot/JaxbDataFormatConfiguration.java
index 2b06b48..c1b2e2f 100644
--- a/platforms/spring-boot/components-starter/camel-jaxb-starter/src/main/java/org/apache/camel/converter/jaxb/springboot/JaxbDataFormatConfiguration.java
+++ b/platforms/spring-boot/components-starter/camel-jaxb-starter/src/main/java/org/apache/camel/converter/jaxb/springboot/JaxbDataFormatConfiguration.java
@@ -45,9 +45,9 @@ public class JaxbDataFormatConfiguration
     /**
      * Sets the schema severity level to use when validating against a schema.
      * This level determines the minimum severity error that triggers JAXB to
-     * stop continue parsing. The default value of 0 (WARNING) means that any
-     * error (WARNING ERROR or FATAL ERROR) will trigger JAXB to stop. There are
-     * the following three levels: 0=WARNING 1=ERROR 2=FATAL ERROR.
+     * stop continue parsing. The default value of 0 (warning) means that any
+     * error (warning error or fatal error) will trigger JAXB to stop. There are
+     * the following three levels: 0=warning 1=error 2=fatal error.
      */
     private Integer schemaSeverityLevel = 0;
     /**

-- 
To stop receiving notification emails like this one, please contact
"commits@camel.apache.org" <co...@camel.apache.org>.