Clone Tools
  • last updated 10 mins ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Fixed CS

    • -1
    • +2
    ./component/websocket/WebsocketSSLContextGlobalRouteExampleTest.java
    • -1
    • +2
    ./component/websocket/WebsocketSSLContextInUriRouteExampleTest.java
  1. … 2 more files in changeset.
CAMEL-14640: Upgrade ahc-client used for testing websocket component

    • -12
    • +25
    ./component/websocket/WebsocketClientCamelRouteTest.java
    • -12
    • +24
    ./component/websocket/WebsocketComponentRouteExampleTest.java
    • -6
    • +43
    ./component/websocket/WebsocketConsumerRouteTest.java
    • -21
    • +51
    ./component/websocket/WebsocketProducerRouteExampleTest.java
    • -12
    • +24
    ./component/websocket/WebsocketProducerRouteRestartTest.java
    • -12
    • +28
    ./component/websocket/WebsocketRouteExampleTest.java
    • -13
    • +28
    ./component/websocket/WebsocketSSLClientAuthRouteExampleTest.java
    • -15
    • +24
    ./component/websocket/WebsocketSSLContextGlobalRouteExampleTest.java
    • -15
    • +24
    ./component/websocket/WebsocketSSLContextInUriRouteExampleTest.java
    • -13
    • +28
    ./component/websocket/WebsocketSSLRouteExampleTest.java
    • -22
    • +51
    ./component/websocket/WebsocketTwoRoutesExampleTest.java
    • -12
    • +28
    ./component/websocket/WebsocketTwoRoutesToSIndividualAndBroadcastEndpointExampleTest.java
    • -11
    • +27
    ./component/websocket/WebsocketTwoRoutesToSameEndpointExampleTest.java
  1. … 1 more file 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.

    • -0
    • +1
    ./component/websocket/WebsocketTwoRoutesExampleTest.java
    • -0
    • +1
    ./component/websocket/WebsocketTwoRoutesToSIndividualAndBroadcastEndpointExampleTest.java
    • -0
    • +1
    ./component/websocket/WebsocketTwoRoutesToSameEndpointExampleTest.java
  1. … 2770 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.

    • -0
    • +1
    ./component/websocket/WebsocketTwoRoutesExampleTest.java
    • -0
    • +1
    ./component/websocket/WebsocketTwoRoutesToSIndividualAndBroadcastEndpointExampleTest.java
    • -0
    • +1
    ./component/websocket/WebsocketTwoRoutesToSameEndpointExampleTest.java
  1. … 2762 more files in changeset.
CAMEL-13987: update keystores used in tests

This changes keystores used in tests:

- changes the type from JKS to PKCS12

- new RSA (2048 bit) key, used to be DSA

- certificate with "localhost" in Subject CN and SubjectAltName:DNS

- certificate valid for 1000 years

    • -3
    • +3
    ./component/websocket/WebsocketSSLClientAuthRouteExampleTest.java
    • -2
    • +2
    ./component/websocket/WebsocketSSLContextGlobalRouteExampleTest.java
    • -2
    • +2
    ./component/websocket/WebsocketSSLContextInUriRouteExampleTest.java
  1. … 73 more files in changeset.
CAMEL-13853: AvailablePortFinder now delegates the port selection to OS

    • -1
    • +1
    ./component/websocket/WebsocketClientCamelRouteTest.java
    • -1
    • +1
    ./component/websocket/WebsocketComponentRouteExampleTest.java
    • -3
    • +3
    ./component/websocket/WebsocketEndpointConfigurationTest.java
    • -1
    • +1
    ./component/websocket/WebsocketProducerRouteExampleTest.java
    • -1
    • +1
    ./component/websocket/WebsocketProducerRouteRestartTest.java
    • -1
    • +1
    ./component/websocket/WebsocketSSLClientAuthRouteExampleTest.java
    • -1
    • +1
    ./component/websocket/WebsocketSSLContextGlobalRouteExampleTest.java
    • -1
    • +1
    ./component/websocket/WebsocketSSLContextInUriRouteExampleTest.java
    • -1
    • +1
    ./component/websocket/WebsocketTwoRoutesExampleTest.java
    • -1
    • +1
    ./component/websocket/WebsocketTwoRoutesToSIndividualAndBroadcastEndpointExampleTest.java
    • -1
    • +1
    ./component/websocket/WebsocketTwoRoutesToSameEndpointExampleTest.java
  1. … 122 more files in changeset.
CAMEL-13853: AvailablePortFinder now delegates the port selection to OS

    • -1
    • +1
    ./component/websocket/WebsocketClientCamelRouteTest.java
    • -1
    • +1
    ./component/websocket/WebsocketComponentRouteExampleTest.java
    • -3
    • +3
    ./component/websocket/WebsocketEndpointConfigurationTest.java
    • -1
    • +1
    ./component/websocket/WebsocketProducerRouteExampleTest.java
    • -1
    • +1
    ./component/websocket/WebsocketProducerRouteRestartTest.java
    • -1
    • +1
    ./component/websocket/WebsocketSSLClientAuthRouteExampleTest.java
    • -1
    • +1
    ./component/websocket/WebsocketSSLContextGlobalRouteExampleTest.java
    • -1
    • +1
    ./component/websocket/WebsocketSSLContextInUriRouteExampleTest.java
    • -1
    • +1
    ./component/websocket/WebsocketTwoRoutesExampleTest.java
    • -1
    • +1
    ./component/websocket/WebsocketTwoRoutesToSIndividualAndBroadcastEndpointExampleTest.java
    • -1
    • +1
    ./component/websocket/WebsocketTwoRoutesToSameEndpointExampleTest.java
  1. … 136 more files in changeset.
CAMEL-13853: AvailablePortFinder now delegates the port selection to OS

    • -1
    • +1
    ./component/websocket/WebsocketClientCamelRouteTest.java
    • -1
    • +1
    ./component/websocket/WebsocketComponentRouteExampleTest.java
    • -3
    • +3
    ./component/websocket/WebsocketEndpointConfigurationTest.java
    • -1
    • +1
    ./component/websocket/WebsocketProducerRouteExampleTest.java
    • -1
    • +1
    ./component/websocket/WebsocketProducerRouteRestartTest.java
    • -1
    • +1
    ./component/websocket/WebsocketSSLClientAuthRouteExampleTest.java
    • -1
    • +1
    ./component/websocket/WebsocketSSLContextGlobalRouteExampleTest.java
    • -1
    • +1
    ./component/websocket/WebsocketSSLContextInUriRouteExampleTest.java
    • -1
    • +1
    ./component/websocket/WebsocketTwoRoutesExampleTest.java
    • -1
    • +1
    ./component/websocket/WebsocketTwoRoutesToSIndividualAndBroadcastEndpointExampleTest.java
    • -1
    • +1
    ./component/websocket/WebsocketTwoRoutesToSameEndpointExampleTest.java
  1. … 123 more files in changeset.
CAMEL-13853: AvailablePortFinder now delegates the port selection to OS

    • -1
    • +1
    ./component/websocket/WebsocketClientCamelRouteTest.java
    • -1
    • +1
    ./component/websocket/WebsocketComponentRouteExampleTest.java
    • -3
    • +3
    ./component/websocket/WebsocketEndpointConfigurationTest.java
    • -1
    • +1
    ./component/websocket/WebsocketProducerRouteExampleTest.java
    • -1
    • +1
    ./component/websocket/WebsocketProducerRouteRestartTest.java
    • -1
    • +1
    ./component/websocket/WebsocketSSLClientAuthRouteExampleTest.java
    • -1
    • +1
    ./component/websocket/WebsocketSSLContextGlobalRouteExampleTest.java
    • -1
    • +1
    ./component/websocket/WebsocketSSLContextInUriRouteExampleTest.java
    • -1
    • +1
    ./component/websocket/WebsocketTwoRoutesExampleTest.java
    • -1
    • +1
    ./component/websocket/WebsocketTwoRoutesToSIndividualAndBroadcastEndpointExampleTest.java
    • -1
    • +1
    ./component/websocket/WebsocketTwoRoutesToSameEndpointExampleTest.java
  1. … 134 more files in changeset.
CAMEL-13853: AvailablePortFinder now delegates the port selection to OS

    • -1
    • +1
    ./component/websocket/WebsocketClientCamelRouteTest.java
    • -1
    • +1
    ./component/websocket/WebsocketComponentRouteExampleTest.java
    • -3
    • +3
    ./component/websocket/WebsocketEndpointConfigurationTest.java
    • -1
    • +1
    ./component/websocket/WebsocketProducerRouteExampleTest.java
    • -1
    • +1
    ./component/websocket/WebsocketProducerRouteRestartTest.java
    • -1
    • +1
    ./component/websocket/WebsocketSSLClientAuthRouteExampleTest.java
    • -1
    • +1
    ./component/websocket/WebsocketSSLContextGlobalRouteExampleTest.java
    • -1
    • +1
    ./component/websocket/WebsocketSSLContextInUriRouteExampleTest.java
    • -1
    • +1
    ./component/websocket/WebsocketTwoRoutesExampleTest.java
    • -1
    • +1
    ./component/websocket/WebsocketTwoRoutesToSIndividualAndBroadcastEndpointExampleTest.java
    • -1
    • +1
    ./component/websocket/WebsocketTwoRoutesToSameEndpointExampleTest.java
  1. … 100 more files in changeset.
CAMEL-13822: Add Override annotations

  1. … 3629 more files in changeset.
Removed unused imports

    • -1
    • +0
    ./component/websocket/WebsocketSSLContextInUriRouteExampleTest.java
CAMEL-13801 - camel3 - Use @BindToRegistry wherever possible, Camel-Websocket

    • -2
    • +4
    ./component/websocket/WebsocketSSLContextInUriRouteExampleTest.java
CAMEL-13563 - Backport Jetty client authn fix only (and not the Jetty upgrade)

    • -0
    • +190
    ./component/websocket/WebsocketSSLClientAuthRouteExampleTest.java
    • -13
    • +12
    ./component/websocket/WebsocketSSLContextGlobalRouteExampleTest.java
    • -13
    • +12
    ./component/websocket/WebsocketSSLContextInUriRouteExampleTest.java
    • -12
    • +12
    ./component/websocket/WebsocketSSLRouteExampleTest.java
  1. … 7 more files in changeset.
CAMEL-13563 - Backport Jetty client authn fix only (and not the Jetty upgrade)

    • -0
    • +190
    ./component/websocket/WebsocketSSLClientAuthRouteExampleTest.java
    • -13
    • +12
    ./component/websocket/WebsocketSSLContextGlobalRouteExampleTest.java
    • -13
    • +12
    ./component/websocket/WebsocketSSLContextInUriRouteExampleTest.java
    • -12
    • +12
    ./component/websocket/WebsocketSSLRouteExampleTest.java
  1. … 7 more files in changeset.
Some fixes for the last merge

    • -6
    • +6
    ./component/websocket/WebsocketSSLClientAuthRouteExampleTest.java
  1. … 4 more files in changeset.
Revert "Missing file from last commit"

This reverts commit c55b613358ebe254ff07bf6028f9bc7b797b15d3.

    • -190
    • +0
    ./component/websocket/WebsocketSSLClientAuthRouteExampleTest.java
Revert "CAMEL-13563 - Update Jetty to 9.4.18 + fix client authentication issues"

This reverts commit 4cfedb0dbc66168e7ac8ac357c021d8b9ecc3362.

Upgrading Jetty breaks cometd Karaf feature, which in turns breaks Saleforce Karaf feature

    • -12
    • +13
    ./component/websocket/WebsocketSSLContextGlobalRouteExampleTest.java
    • -12
    • +13
    ./component/websocket/WebsocketSSLContextInUriRouteExampleTest.java
    • -12
    • +12
    ./component/websocket/WebsocketSSLRouteExampleTest.java
  1. … 14 more files in changeset.
Missing file from last commit

    • -0
    • +190
    ./component/websocket/WebsocketSSLClientAuthRouteExampleTest.java
Missing file from last commit

    • -0
    • +190
    ./component/websocket/WebsocketSSLClientAuthRouteExampleTest.java
Missing file from last commit

    • -0
    • +190
    ./component/websocket/WebsocketSSLClientAuthRouteExampleTest.java
CAMEL-13563 - Update Jetty to 9.4.18 + fix client authentication issues

    • -13
    • +12
    ./component/websocket/WebsocketSSLContextGlobalRouteExampleTest.java
    • -13
    • +12
    ./component/websocket/WebsocketSSLContextInUriRouteExampleTest.java
    • -12
    • +12
    ./component/websocket/WebsocketSSLRouteExampleTest.java
  1. … 14 more files in changeset.
CAMEL-13563 - Update Jetty to 9.4.18 + fix client authentication issues

    • -0
    • +190
    ./component/websocket/WebsocketSSLClientAuthRouteExampleTest.java
    • -13
    • +12
    ./component/websocket/WebsocketSSLContextGlobalRouteExampleTest.java
    • -13
    • +12
    ./component/websocket/WebsocketSSLContextInUriRouteExampleTest.java
    • -12
    • +12
    ./component/websocket/WebsocketSSLRouteExampleTest.java
  1. … 18 more files in changeset.
CAMEL-13563 - Update Jetty to 9.4.18 + fix client authentication issues

    • -0
    • +190
    ./component/websocket/WebsocketSSLClientAuthRouteExampleTest.java
    • -13
    • +12
    ./component/websocket/WebsocketSSLContextGlobalRouteExampleTest.java
    • -13
    • +12
    ./component/websocket/WebsocketSSLContextInUriRouteExampleTest.java
    • -12
    • +12
    ./component/websocket/WebsocketSSLRouteExampleTest.java
  1. … 17 more files in changeset.
CAMEL-13563 - Update Jetty to 9.4.18 + fix client authentication issues

    • -13
    • +12
    ./component/websocket/WebsocketSSLContextGlobalRouteExampleTest.java
    • -13
    • +12
    ./component/websocket/WebsocketSSLContextInUriRouteExampleTest.java
    • -12
    • +12
    ./component/websocket/WebsocketSSLRouteExampleTest.java
  1. … 14 more files in changeset.
CAMEL-13563 - Update Jetty to 9.4.18 + fix client authentication issues

    • -0
    • +190
    ./component/websocket/WebsocketSSLClientAuthRouteExampleTest.java
    • -13
    • +12
    ./component/websocket/WebsocketSSLContextGlobalRouteExampleTest.java
    • -13
    • +12
    ./component/websocket/WebsocketSSLContextInUriRouteExampleTest.java
    • -12
    • +12
    ./component/websocket/WebsocketSSLRouteExampleTest.java
  1. … 18 more files in changeset.
CAMEL-13563 - Update Jetty to 9.4.18 + fix client authentication issues

    • -13
    • +12
    ./component/websocket/WebsocketSSLContextGlobalRouteExampleTest.java
    • -13
    • +12
    ./component/websocket/WebsocketSSLContextInUriRouteExampleTest.java
    • -12
    • +12
    ./component/websocket/WebsocketSSLRouteExampleTest.java
  1. … 13 more files in changeset.
CAMEL-13563 - Update Jetty to 9.4.18 + fix client authentication issues

    • -0
    • +190
    ./component/websocket/WebsocketSSLClientAuthRouteExampleTest.java
    • -13
    • +12
    ./component/websocket/WebsocketSSLContextGlobalRouteExampleTest.java
    • -13
    • +12
    ./component/websocket/WebsocketSSLContextInUriRouteExampleTest.java
    • -12
    • +12
    ./component/websocket/WebsocketSSLRouteExampleTest.java
  1. … 18 more files in changeset.
Do not use the deprecated uri field in @EndpointInject / @Consume / @Produce

    • -1
    • +1
    ./component/websocket/WebsocketProducerRouteExampleTest.java
    • -1
    • +1
    ./component/websocket/WebsocketProducerRouteRestartTest.java
  1. … 496 more files in changeset.
Fixed CS for Camel-Websocket

    • -2
    • +2
    ./component/websocket/WebsocketSSLContextGlobalRouteExampleTest.java
    • -2
    • +2
    ./component/websocket/WebsocketSSLContextInUriRouteExampleTest.java
  1. … 2 more files in changeset.