Skip to content

Spring WS docs and code cleanup.#15382

Merged
davsclaus merged 3 commits intoapache:mainfrom
ammachado:camel-spring-ws-docs
Sep 2, 2024
Merged

Spring WS docs and code cleanup.#15382
davsclaus merged 3 commits intoapache:mainfrom
ammachado:camel-spring-ws-docs

Conversation

@ammachado
Copy link
Contributor

Description

This PR adds small changes to the Spring-WS component documentation, as well as it applies the instanceof pattern cleanup a few times.

Target

  • I checked that the commit is targeting the correct branch (note that Camel 3 uses camel-3.x, whereas Camel 4 uses the main branch)

Tracking

  • If this is a large change, bug fix, or code improvement, I checked there is a JIRA issue filed for the change (usually before you start working on it).

Apache Camel coding standards and style

  • I checked that each commit in the pull request has a meaningful subject line and body.
  • I have run mvn clean install -DskipTests locally from root folder and I have committed all auto-generated changes.

@github-actions
Copy link
Contributor

🌟 Thank you for your contribution to the Apache Camel project! 🌟

🤖 CI automation will test this PR automatically.

🐫 Apache Camel Committers, please review the following items:

  • First-time contributors require MANUAL approval for the GitHub Actions to run

  • You can use the command /component-test (camel-)component-name1 (camel-)component-name2.. to request a test from the test bot.

  • You can label PRs using build-all, build-dependents, skip-tests and test-dependents to fine-tune the checks executed by this PR.

  • Build and test logs are available in the Summary page. Only Apache Camel committers have access to the summary.

  • ⚠️ Be careful when sharing logs. Review their contents before sharing them publicly.

addEndpointDispatcherToConfiguration(configuration, lookupKey);
} else {
addEndpointMappingToConfiguration(parameters, configuration);
if (type.equals(EndpointMappingType.XPATHRESULT)) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

it seem this code is moved into this else block which was not the case before.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You are correct, but this block will only execute if the branch where it is now is executed anyway, so I moved them together.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

A bit of a nitpick, but ideally it should be on a separate commit, as it prevents us from cherry-picking the doc changes to 4.4.x if we would like to.

@davsclaus
Copy link
Contributor

modified:   components/camel-spring-ws/src/main/java/org/apache/camel/component/spring/ws/bean/WSACamelEndpointMapping.java
modified:   components/camel-spring-ws/src/main/java/org/apache/camel/component/spring/ws/converter/StringSourceConverter.java

Copy link
Contributor

@orpiske orpiske left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Those are great changes.

IMHO it would be better to have them on separate commits, so we can cherry-pick changes if we want to.

@davsclaus
Copy link
Contributor

@ammachado there are 2 modified files. If you run mvn clean install in the folder then it would update those files.

@ammachado
Copy link
Contributor Author

ammachado commented Sep 1, 2024

My local build has some failing tests on camel-openapi-java, that's why I missed these changes. I'll open a JIRA for them https://issues.apache.org/jira/browse/CAMEL-21151.

@ammachado
Copy link
Contributor Author

ammachado commented Sep 2, 2024

I added a PR on Spring-WS to upgrade WSS4J as well and match the version used in Camel spring-projects/spring-ws#1429.

@davsclaus davsclaus merged commit 752b98f into apache:main Sep 2, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants