Clone Tools
  • last updated 27 mins ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
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/test/spring/CamelSpringRunnerDisableJmxInheritedOverrideTest.java
    • -1
    • +1
    ./camel/test/spring/CamelSpringRunnerProvidesBreakpointTest.java
    • -0
    • +1
    ./camel/test/spring/CamelSpringRunnerShutdownTimeoutInheritedOverrideTest.java
  1. … 2769 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/test/spring/CamelSpringRunnerDisableJmxInheritedOverrideTest.java
    • -1
    • +1
    ./camel/test/spring/CamelSpringRunnerProvidesBreakpointTest.java
    • -0
    • +1
    ./camel/test/spring/CamelSpringRunnerShutdownTimeoutInheritedOverrideTest.java
  1. … 2761 more files in changeset.
Camel 13947 (#3199)

CAMEL-13947: PropertiesComponent should be a static service and resolved like other similar features.

    • -1
    • +1
    ./camel/test/spring/CamelSpringPropertiesLocationElementTest.java
  1. … 204 more files in changeset.
CAMEL-13947: PropertiesComponent should be a static service and resolved like other similar features.

    • -1
    • +1
    ./camel/test/spring/CamelSpringPropertiesLocationElementTest.java
  1. … 7 more files in changeset.
CAMEL-13822: Add Override annotations

    • -0
    • +1
    ./camel/test/spring/CamelSpringRouteProcessorDumpRouteCoverageTest.java
    • -0
    • +1
    ./camel/test/spring/CamelSpringRunnerDisableJmxInheritedOverrideTest.java
  1. … 3627 more files in changeset.
CAMEL-13588: restore example tags

CAMEL-13793: Support for multiple camel contexts on various Camel annotations dropped as we only support 1 context per app/deployment.

    • -1
    • +0
    ./camel/test/spring/CamelSpringRouteProcessorDumpRouteCoverageTest.java
    • -56
    • +0
    ./camel/test/spring/CamelSpringRunnerMockEndpointsAndSkipTest.java
    • -57
    • +0
    ./camel/test/spring/CamelSpringRunnerMockEndpointsTest.java
    • -2
    • +1
    ./camel/test/spring/CamelSpringRunnerProvidesBreakpointTest.java
  1. … 14 more files in changeset.
CAMEL-13342: Implemented a first version of a proof-of-concept for camel-test-spring/SpringExtension with JUnit 5

    • -0
    • +83
    ./camel/test/junit5/patterns/DebugSpringTest.java
    • -0
    • +41
    ./camel/test/junit5/patterns/MyProduceBean.java
    • -0
    • +25
    ./camel/test/junit5/patterns/MySender.java
    • -0
    • +42
    ./camel/test/junit5/patterns/ProduceBeanTest.java
    • -0
    • +63
    ./camel/test/junit5/patterns/SimpleMockTest.java
    • -0
    • +54
    ./camel/test/junit5/spring/CamelSpringOverridePropertiesForPropertyInjectTest.java
  1. … 34 more files in changeset.
CAMEL-13342: Implemented a first version of a proof-of-concept for camel-test-spring/SpringExtension with JUnit 5

    • -0
    • +83
    ./camel/test/junit5/patterns/DebugSpringTest.java
    • -0
    • +41
    ./camel/test/junit5/patterns/MyProduceBean.java
    • -0
    • +25
    ./camel/test/junit5/patterns/MySender.java
    • -0
    • +42
    ./camel/test/junit5/patterns/ProduceBeanTest.java
    • -0
    • +63
    ./camel/test/junit5/patterns/SimpleMockTest.java
    • -0
    • +54
    ./camel/test/junit5/spring/CamelSpringOverridePropertiesForPropertyInjectTest.java
  1. … 34 more files in changeset.
CAMEL-13342: Implemented a first version of a proof-of-concept for camel-test-spring/SpringExtension with JUnit 5

    • -0
    • +83
    ./camel/test/junit5/patterns/DebugSpringTest.java
    • -0
    • +41
    ./camel/test/junit5/patterns/MyProduceBean.java
    • -0
    • +25
    ./camel/test/junit5/patterns/MySender.java
    • -0
    • +42
    ./camel/test/junit5/patterns/ProduceBeanTest.java
    • -0
    • +63
    ./camel/test/junit5/patterns/SimpleMockTest.java
    • -0
    • +54
    ./camel/test/junit5/spring/CamelSpringOverridePropertiesForPropertyInjectTest.java
  1. … 34 more files in changeset.
CAMEL-13342: Implemented a first version of a proof-of-concept for camel-test-spring/SpringExtension with JUnit 5

    • -0
    • +40
    ./camel/test/junit5/patterns/DebugSpringCamelContextTest.java
    • -0
    • +83
    ./camel/test/junit5/patterns/DebugSpringTest.java
    • -0
    • +41
    ./camel/test/junit5/patterns/MyProduceBean.java
    • -0
    • +25
    ./camel/test/junit5/patterns/MySender.java
    • -0
    • +42
    ./camel/test/junit5/patterns/ProduceBeanTest.java
    • -0
    • +40
    ./camel/test/junit5/patterns/ProducerBeanInjectTest.java
    • -0
    • +63
    ./camel/test/junit5/patterns/SimpleMockTest.java
    • -0
    • +56
    ./camel/test/junit5/spring/CamelSpringActiveProfileTest.java
    • -0
    • +32
    ./camel/test/junit5/spring/CamelSpringDisableJmxInheritedOverrideTest.java
    • -0
    • +21
    ./camel/test/junit5/spring/CamelSpringDisableJmxInheritedTest.java
    • -0
    • +33
    ./camel/test/junit5/spring/CamelSpringDisableJmxTest.java
    • -0
    • +32
    ./camel/test/junit5/spring/CamelSpringExcludeRoutesTest.java
    • -0
    • +57
    ./camel/test/junit5/spring/CamelSpringMockEndpointsAndSkipTest.java
    • -0
    • +58
    ./camel/test/junit5/spring/CamelSpringMockEndpointsTest.java
    • -0
    • +54
    ./camel/test/junit5/spring/CamelSpringOverridePropertiesForPropertyInjectTest.java
  1. … 34 more files in changeset.
CAMEL-13342: Moved further the proof-of-concept for camel-test-spring/CamelSpringTestSupport

    • -2
    • +2
    ./camel/test/issues/AdviceWithInterceptSendToEndpointWithLoadbalancerTest.java
    • -2
    • +2
    ./camel/test/issues/AdviceWithOnExceptionMultipleIssueTest.java
    • -2
    • +2
    ./camel/test/issues/MockEndpointsAndSkipTest.java
  1. … 31 more files in changeset.
CAMEL-13342: Moved further the proof-of-concept for camel-test-spring/CamelSpringTestSupport

    • -2
    • +2
    ./camel/test/issues/AdviceWithInterceptSendToEndpointWithLoadbalancerTest.java
    • -2
    • +2
    ./camel/test/issues/AdviceWithOnExceptionMultipleIssueTest.java
    • -2
    • +2
    ./camel/test/issues/MockEndpointsAndSkipTest.java
  1. … 31 more files in changeset.
CAMEL-13342: Moved further the proof-of-concept for camel-test-spring/CamelSpringTestSupport

    • -2
    • +2
    ./camel/test/issues/AdviceWithInterceptSendToEndpointWithLoadbalancerTest.java
    • -2
    • +2
    ./camel/test/issues/AdviceWithOnExceptionMultipleIssueTest.java
    • -2
    • +2
    ./camel/test/issues/MockEndpointsAndSkipTest.java
  1. … 31 more files in changeset.
CAMEL-13342: Moved further the proof-of-concept for camel-test-spring/CamelSpringTestSupport

    • -2
    • +2
    ./camel/test/issues/AdviceWithInterceptSendToEndpointWithLoadbalancerTest.java
    • -2
    • +2
    ./camel/test/issues/AdviceWithOnExceptionMultipleIssueTest.java
    • -2
    • +2
    ./camel/test/issues/MockEndpointsAndSkipTest.java
  1. … 31 more files in changeset.
CAMEL-13708, CAMEL-13721, CAMEL-13694, CAMEL-13720: Fixed compile after little code change

    • -2
    • +1
    ./camel/test/spring/CamelSpringPropertiesLocationElementTest.java
CAMEL-13491: Fixed CS. And some smaller improvements between camel-test and camel-test-spring

    • -3
    • +26
    ./camel/test/patterns/SimpleMockTest.java
  1. … 3 more files in changeset.
CAMEL-13491: Fixed CS. And some smaller improvements between camel-test and camel-test-spring

    • -3
    • +26
    ./camel/test/patterns/SimpleMockTest.java
  1. … 3 more files in changeset.
CAMEL-13543 - Fixed CS

    • -3
    • +3
    ./camel/test/spring/CamelSpringOverridePropertiesForPropertyInjectTest.java
  1. … 1 more file in changeset.
CAMEL-13543 - Fixed CS

    • -3
    • +3
    ./camel/test/spring/CamelSpringOverridePropertiesForPropertyInjectTest.java
  1. … 1 more file in changeset.
CAMEL-13453 - Fixed CS

    • -4
    • +4
    ./camel/test/spring/CamelSpringOverridePropertiesForPropertyInjectTest.java
  1. … 1 more file in changeset.
CAMEL-13543: Make CamelSpringTestContextLoader set property overrides before the CamelContext is injected into any other bean

    • -0
    • +57
    ./camel/test/spring/CamelSpringOverridePropertiesForPropertyInjectTest.java
    • -0
    • +33
    ./camel/test/spring/TestPropertyInjectRouteBuilder.java
  1. … 4 more files in changeset.
CAMEL-13543: Make CamelSpringTestContextLoader set property overrides before the CamelContext is injected into any other bean

    • -0
    • +57
    ./camel/test/spring/CamelSpringOverridePropertiesForPropertyInjectTest.java
    • -0
    • +33
    ./camel/test/spring/TestPropertyInjectRouteBuilder.java
  1. … 4 more files in changeset.
CAMEL-13543: Make CamelSpringTestContextLoader set property overrides before the CamelContext is injected into any other bean

    • -0
    • +57
    ./camel/test/spring/CamelSpringOverridePropertiesForPropertyInjectTest.java
    • -0
    • +33
    ./camel/test/spring/TestPropertyInjectRouteBuilder.java
  1. … 3 more files in changeset.
Do not use the deprecated uri field in @EndpointInject / @Consume / @Produce

    • -2
    • +2
    ./camel/test/patterns/MyProduceBean.java
    • -1
    • +1
    ./camel/test/spring/CamelSpringPropertiesLocationElementTest.java
    • -2
    • +2
    ./camel/test/spring/CamelSpringRunnerMockEndpointsAndSkipTest.java
    • -2
    • +2
    ./camel/test/spring/CamelSpringRunnerTestPropertySourceTest.java
  1. … 490 more files in changeset.
[CAMEL-13469] Move camel core classes that are not dependent on the model to camel-base

    • -1
    • +1
    ./camel/test/spring/CamelSpringRunnerDisableJmxInheritedOverrideTest.java
    • -1
    • +1
    ./camel/test/spring/CamelSpringRunnerProvidesBreakpointTest.java
  1. … 708 more files in changeset.
CAMEL-13266: Make camel-management-impl optional so users can run Camel with and without JMX

    • -2
    • +3
    ./camel/test/spring/CamelSpringRouteProcessorDumpRouteCoverageTest.java
  1. … 37 more files in changeset.
CAMEL-13108: Move mock component out of camel-core (#2738)

Some work to get closer to be able to move mock, dataset and test components out of camel-core. However the builder stuff is tightly coupled to camel-core builder package and would require some more work to find a good way to do this. Will look at this later, but wanted to get this work so far upstream.

    • -2
    • +2
    ./camel/test/spring/CamelSpringRunnerMockEndpointsAndSkipTest.java
  1. … 25 more files in changeset.
Prepare org.apache.camel.management for extraction

# Conflicts:

# camel-api/src/main/java/org/apache/camel/spi/ManagementObjectNameStrategy.java

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

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

# camel-core/src/main/java/org/apache/camel/management/DefaultManagementLifecycleStrategy.java

# camel-core/src/main/java/org/apache/camel/management/DefaultManagementObjectNameStrategy.java

# camel-core/src/main/java/org/apache/camel/management/ManagedManagementStrategy.java

# camel-core/src/test/java/org/apache/camel/impl/event/EventNotifierExchangeSentParallelTest.java

# camel-core/src/test/java/org/apache/camel/management/ManagedNamePatternIncludeHostNameTest.java

# components/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelContextFactoryBean.java

    • -1
    • +1
    ./camel/test/spring/CamelSpringRunnerDisableJmxInheritedOverrideTest.java
  1. … 138 more files in changeset.
[api] Improve api cohesiveness

    • -2
    • +2
    ./camel/test/spring/CamelSpringRunnerProvidesBreakpointTest.java
  1. … 147 more files in changeset.