Clone Tools
  • last updated 21 mins ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
[CAMEL-14411] delegate conversion during dataformat reification to the camel context converter

  1. … 65 more files in changeset.
CAMEL-14180: Fix Checkstyle issues

Seems that previous versions of Checkstyle had few issues with checking

import sort/grouping. So I've run impsort Maven plugin:

mvn net.revelc.code:impsort-maven-plugin:sort -Dimpsort.groups=java,javax,org.w3c,org.xml,junit -Dimpsort.removeUnused=true -Dimpsort.staticAfter=true

To sort all the imports according to the Checkstyle rule.

Few remaining issues around indentation and unnecessary parentheses I

fixed manually.

    • -1
    • +1
    ./camel/converter/jaxb/person/Person.java
    • -1
    • +1
    ./camel/example/ExplicitEncodingAndXMLCharFilteringTest.java
    • -3
    • +1
    ./camel/example/SpringDataFormatTest.java
    • -1
    • +0
    ./camel/jaxb/CamelJaxbNoNamespaceSchemaLocationSpringTest.java
    • -1
    • +0
    ./camel/jaxb/CamelJaxbNoNamespaceSchemaTest.java
    • -2
    • +1
    ./camel/jaxb/FallbackTypeConverterObjectFactoryDisabledTest.java
  1. … 2759 more files in changeset.
CAMEL-14180: Fix Checkstyle issues

Seems that previous versions of Checkstyle had few issues with checking

import sort/grouping. So I've run impsort Maven plugin:

mvn net.revelc.code:impsort-maven-plugin:sort -Dimpsort.groups=java,javax,org.w3c,org.xml,junit -Dimpsort.removeUnused=true -Dimpsort.staticAfter=true

To sort all the imports according to the Checkstyle rule.

Few remaining issues around indentation and unnecessary parentheses I

fixed manually.

    • -1
    • +1
    ./camel/converter/jaxb/person/Person.java
    • -1
    • +1
    ./camel/example/ExplicitEncodingAndXMLCharFilteringTest.java
    • -3
    • +1
    ./camel/example/SpringDataFormatTest.java
    • -1
    • +0
    ./camel/jaxb/CamelJaxbNoNamespaceSchemaLocationSpringTest.java
    • -1
    • +0
    ./camel/jaxb/CamelJaxbNoNamespaceSchemaTest.java
    • -2
    • +1
    ./camel/jaxb/FallbackTypeConverterObjectFactoryDisabledTest.java
  1. … 2751 more files in changeset.
tiny cleanups: - remove unused import statements - make use of type inference for generic instance creation - remove obsolete 'public', 'static' and 'final' modifiers in interfaces - change field/method accesses to it's owning supertype - remove obsolete type castings - remove obsolete semicolons

  1. … 346 more files in changeset.
CAMEL-13822: Add Override annotations

    • -0
    • +1
    ./camel/example/DataFormatDataSetTest.java
    • -0
    • +1
    ./camel/example/SpringDataFormatTest.java
    • -0
    • +1
    ./camel/example/SpringDataFormatWithEncodingTest.java
    • -0
    • +1
    ./camel/example/SpringDataFormatWithMarshalAndUnmarshalUsingRefTest.java
    • -0
    • +1
    ./camel/example/SpringDataFormatWithMarshalAndUnmarshalUsingSpringBeanTest.java
    • -0
    • +1
    ./camel/jaxb/CamelJaxbNoNamespaceSchemaLocationSpringTest.java
  1. … 3618 more files in changeset.
Camel-Jaxb: Use BindToRegistry annotation wherever possible

    • -7
    • +5
    ./camel/jaxb/JaxbMarshalNamespacePrefixMapperTest.java
Camel 13755 (#3053)

CAMEL-13755: camel3 - Remove fault from camel-core/message and let it be component specific for camel-cxf and camel-spring-ws as its only used by SOAP-WS

    • -2
    • +0
    ./camel/jaxb/SplitterAndExceptionRouteTwistIssueTest.java
  1. … 165 more files in changeset.
CAMEL-13755: camel3 - Remove fault from camel-core/message and let it be component specific for camel-cxf and camel-spring-ws as its only used by SOAP-WS

    • -2
    • +0
    ./camel/jaxb/SplitterAndExceptionRouteTwistIssueTest.java
  1. … 12 more files in changeset.
CAMEL-13629: Renamed tests to follow *Test pattern

    • -116
    • +0
    ./camel/converter/jaxb/JaxbDataFormatSchemaValidationTestWithObjectFactory.java
    • -0
    • +116
    ./camel/converter/jaxb/JaxbDataFormatSchemaValidationWithObjectFactoryTest.java
  1. … 63 more files in changeset.
CAMEL-13514: Service API should not use checked exceptions in start/stop methods.

    • -2
    • +2
    ./camel/jaxb/CamelJaxbNoNamespaceSchemaLocationSpringTest.java
  1. … 35 more files in changeset.
Do not use the deprecated uri field in @EndpointInject / @Consume / @Produce

    • -2
    • +2
    ./camel/converter/jaxb/ConcurrentJaxbDataFormatSchemaValidationTest.java
    • -2
    • +2
    ./camel/converter/jaxb/JaxbDataFormatSchemaValidationTestWithObjectFactory.java
    • -4
    • +4
    ./camel/jaxb/SplitterAndExceptionRouteTwistIssueTest.java
  1. … 490 more files in changeset.
Fixed CS for Camel-Jaxb

    • -1
    • +1
    ./camel/jaxb/CamelJaxbFallbackConverterTest.java
  1. … 1 more file in changeset.
CAMEL-13336: update license headers

    • -1
    • +1
    ./camel/converter/jaxb/ConcurrentJaxbDataFormatSchemaValidationTest.java
    • -1
    • +1
    ./camel/converter/jaxb/JaxbDataFormatSchemaValidationTestWithObjectFactory.java
    • -1
    • +1
    ./camel/converter/jaxb/JaxbDataFormatTest.java
    • -1
    • +1
    ./camel/converter/jaxb/address/Address.java
    • -1
    • +1
    ./camel/converter/jaxb/message/Message.java
  1. … 17910 more files in changeset.
CAMEL-13313: Add support for generating type converter loader source code to be able to load component type converters in a faster way

    • -4
    • +4
    ./camel/jaxb/CamelJaxbFallbackConverterTest.java
  1. … 5 more files in changeset.
Fix for CAMEL-13282

When a JAXB class that is created or generated has no @XmlRootElement

annotation JaxbDataFormat would try to find a ObjectFactory method which

can create a JAXBElement for the type of the object. It would then use

the JAXBElement to marshal the object.

While trying to find the objectFactory and to call the appropriate

method it would catch ALL Exceptions that are thrown and just logs a

message.

While i don't see why an Exception should only be logged here this

breaks when the exception is thrown due to a validation error. Because

the calls to the marshal operation will throw an MarshalException in

that case which would be caught by the catch block. In other cases where

no object factory is used but JAXB classes with XmlRootElement

Annotations or JAXBElements are used the MarshalExceptions will be

thrown and the doMarshal method will be left.

So i basically check the type of the exception that is thrown and

rethrow it if it's a MarshalException. All other exceptions are handled

in the same way as before. I kept the old exception handling in order to

keep the code as much backwards compatible as possible. But it should be

removed for 3.0.0 at the latest

    • -11
    • +63
    ./camel/converter/jaxb/JaxbDataFormatSchemaValidationSpringTest.java
    • -0
    • +116
    ./camel/converter/jaxb/JaxbDataFormatSchemaValidationTestWithObjectFactory.java
  1. … 4 more files in changeset.
Fix for CAMEL-13282

When a JAXB class that is created or generated has no @XmlRootElement

annotation JaxbDataFormat would try to find a ObjectFactory method which

can create a JAXBElement for the type of the object. It would then use

the JAXBElement to marshal the object.

While trying to find the objectFactory and to call the appropriate

method it would catch ALL Exceptions that are thrown and just logs a

message.

While i don't see why an Exception should only be logged here this

breaks when the exception is thrown due to a validation error. Because

the calls to the marshal operation will throw an MarshalException in

that case which would be caught by the catch block. In other cases where

no object factory is used but JAXB classes with XmlRootElement

Annotations or JAXBElements are used the MarshalExceptions will be

thrown and the doMarshal method will be left.

So i basically check the type of the exception that is thrown and

rethrow it if it's a MarshalException. All other exceptions are handled

in the same way as before. I kept the old exception handling in order to

keep the code as much backwards compatible as possible. But it should be

removed for 3.0.0 at the latest

    • -11
    • +63
    ./camel/converter/jaxb/JaxbDataFormatSchemaValidationSpringTest.java
    • -0
    • +116
    ./camel/converter/jaxb/JaxbDataFormatSchemaValidationTestWithObjectFactory.java
  1. … 4 more files in changeset.
CAMEL-8293: camel-test should use Registry and let user bind beans more easily instead of having to use JndiRegistry.

    • -6
    • +3
    ./camel/example/DataFormatDataSetTest.java
  1. … 46 more files in changeset.
Move stuff around to isolate o.a.c.util from o.a.c and o.a.c.support from o.a.c.impl

# Conflicts:

# camel-core/src/main/java/org/apache/camel/impl/InterceptSendToEndpointProcessor.java

    • -1
    • +1
    ./camel/converter/jaxb/JaxbDataFormatTest.java
    • -1
    • +1
    ./camel/jaxb/CamelJaxbFallbackConverterTest.java
  1. … 2743 more files in changeset.
[CAMEL-10469] Remove @version in java source code

    • -1
    • +0
    ./camel/converter/jaxb/address/Address.java
    • -1
    • +0
    ./camel/converter/jaxb/person/Person.java
    • -3
    • +0
    ./camel/example/DataFormatDataSetTest.java
    • -3
    • +0
    ./camel/example/ExplicitEncodingAndXMLCharFilteringTest.java
    • -3
    • +0
    ./camel/example/InvalidOrderException.java
  1. … 3749 more files in changeset.
[CAMEL-12818] Remove deprecated stuff

    • -1
    • +1
    ./camel/jaxb/CamelJaxbNoNamespaceSchemaLocationSpringTest.java
  1. … 78 more files in changeset.
CAMEL-12816: CS fixes

    • -2
    • +1
    ./camel/example/ExplicitEncodingAndXMLCharFilteringTest.java
  1. … 62 more files in changeset.
[CAMEL-12761] Fix indentation

    • -2
    • +2
    ./camel/example/ExplicitEncodingAndXMLCharFilteringTest.java
  1. … 665 more files in changeset.
[CAMEL-12761] Switch to junit 4

    • -1
    • +3
    ./camel/example/ExplicitEncodingAndXMLCharFilteringTest.java
  1. … 3178 more files in changeset.
polish

    • -1
    • +1
    ./camel/jaxb/JaxbMarshalNamespacePrefixMapperTest.java
    • -1
    • +1
    ./camel/jaxb/SplitterAndExceptionRouteTwistIssueTest.java
  1. … 145 more files in changeset.
CAMEL-12415 - camel-jaxb, fix options combination: encoding,filterNonXmlChars

(cherry picked from commit 608dd28f88a4b983e0abb0fa21c7ab68fc809345)

    • -0
    • +85
    ./camel/example/ExplicitEncodingAndXMLCharFilteringTest.java
  1. … 3 more files in changeset.
CAMEL-12415 - camel-jaxb, fix options combination: encoding,filterNonXmlChars

    • -0
    • +85
    ./camel/example/ExplicitEncodingAndXMLCharFilteringTest.java
  1. … 3 more files in changeset.
CAMEL-12062 Propagate encoding in property

    • -0
    • +77
    ./camel/example/ExplicitFileEncodingTest.java
  1. … 1 more file in changeset.
CAMEL-11869: Upgrade mockito-core to 2.11.0 for camel-google-bigquery, camel-jaxb and camel-spark-rest

    • -1
    • +1
    ./camel/jaxb/FallbackTypeConverterObjectFactoryDisabledTest.java
    • -1
    • +1
    ./camel/jaxb/FallbackTypeConverterObjectFactoryEnabledTest.java
  1. … 5 more files in changeset.
Unable to change DataFormat.contentTypeHeader value to false

JaxbDataFormat has a contentTypeHeader property with default value of TRUE. It should be able to change contentTypeHeader to FALSE.

  1. … 2 more files in changeset.
CAMEL-5723 - naming fix

  1. … 1 more file in changeset.