From 8719e60a6e195a32110fb9a483776c87c6124cdb Mon Sep 17 00:00:00 2001 From: ue85540 Date: Sat, 3 Jun 2023 10:37:11 +0200 Subject: [PATCH] STTRS-1136 prepare to be open source --- .github/workflows/ossrhDeploy.yml | 32 ++++ CHANGELOG.md | 22 ++- CODE_OF_CONDUCT.md | 132 +++++++++++++++ CONTRIBUTING.md | 100 ++++++++++++ LICENSE | 21 +++ README.md | 4 +- estaTektonPipeline.json | 53 ------ pom.xml | 152 +++++++++++++++--- .../config/BinderTopicMappings.java | 2 +- .../config/RequestReplyProperties.java | 2 +- ...ropertySourceEnvironmentPostProcessor.java | 5 +- .../env/ReplyTopicWithWildcards.java | 6 +- ...ReplyTopicWithWildcardsPropertySource.java | 2 +- .../exception/RequestReplyException.java | 2 +- .../service/MessageConverter.java | 2 +- .../RequestReplyAutoConfiguration.java | 8 +- .../service/RequestReplyService.java | 4 +- .../service/RequestReplyServiceImpl.java | 14 +- .../requestreply/service/ResponseHandler.java | 4 +- ...questReplyMessageHeaderSupportService.java | 20 +-- .../header/parser/BinderHeaderParser.java | 4 +- .../header/parser/HttpHeaderParser.java | 4 +- .../header/parser/SolaceHeaderParser.java | 8 +- .../parser/SpringCloudStreamHeaderParser.java | 4 +- .../header/parser/SpringHeaderParser.java | 8 +- .../parser/SpringIntegrationHeaderParser.java | 4 +- .../MessageCorrelationIdParser.java | 2 +- .../MessageHeaderCorrelationIdParser.java | 2 +- .../destination/MessageDestinationParser.java | 2 +- .../MessageHeaderDestinationParser.java | 2 +- .../MessageErrorMessageParser.java | 2 +- .../MessageHeaderErrorMessageParser.java | 2 +- .../errormessage/RemoteErrorException.java | 2 +- .../replyto/MessageHeaderReplyToParser.java | 2 +- .../parser/replyto/MessageReplyToParser.java | 2 +- .../MessageHeaderTotalRepliesParser.java | 2 +- .../MessageTotalRepliesParser.java | 2 +- .../util/CheckedExceptionWrapper.java | 4 +- .../requestreply/util/MessageChunker.java | 4 +- src/main/resources/META-INF/spring.factories | 4 +- ...ot.autoconfigure.AutoConfiguration.imports | 2 +- .../requestreply/AbstractRequestReplyIT.java | 11 +- ...tReplyMessageHeaderSupportServiceTest.java | 6 +- .../requestreply/model/SensorReading.java | 2 +- .../RequestReplyTestApplication.java | 8 +- .../RequestReplyTestConfiguration.java | 6 +- .../controller/RequestReplyController.java | 6 +- .../integration/RequestReplyTestEndpoint.java | 4 +- .../service/HeaderParserTests.java | 18 +-- .../service/RequestReplyServiceTests.java | 11 +- ...ReplyMessageHeaderSupportServiceTests.java | 6 +- .../parser/BinderHeaderParserTests.java | 2 +- .../SpringCloudStreamHeaderParserTests.java | 2 +- .../util/CheckedExceptionWrapperTest.java | 4 +- src/test/resources/application-localApp.yaml | 2 +- src/test/resources/application-test.yaml | 2 +- 56 files changed, 546 insertions(+), 199 deletions(-) create mode 100644 .github/workflows/ossrhDeploy.yml create mode 100644 CODE_OF_CONDUCT.md create mode 100644 CONTRIBUTING.md create mode 100644 LICENSE delete mode 100644 estaTektonPipeline.json rename src/main/java/{ch/sbb/tms/platform/springbootstarter => community/solace/spring/cloud}/requestreply/config/BinderTopicMappings.java (93%) rename src/main/java/{ch/sbb/tms/platform/springbootstarter => community/solace/spring/cloud}/requestreply/config/RequestReplyProperties.java (97%) rename src/main/java/{ch/sbb/tms/platform/springbootstarter => community/solace/spring/cloud}/requestreply/env/ReplyTopicWithWildcardPropertySourceEnvironmentPostProcessor.java (83%) rename src/main/java/{ch/sbb/tms/platform/springbootstarter => community/solace/spring/cloud}/requestreply/env/ReplyTopicWithWildcards.java (79%) rename src/main/java/{ch/sbb/tms/platform/springbootstarter => community/solace/spring/cloud}/requestreply/env/ReplyTopicWithWildcardsPropertySource.java (97%) rename src/main/java/{ch/sbb/tms/platform/springbootstarter => community/solace/spring/cloud}/requestreply/exception/RequestReplyException.java (78%) rename src/main/java/{ch/sbb/tms/platform/springbootstarter => community/solace/spring/cloud}/requestreply/service/MessageConverter.java (97%) rename src/main/java/{ch/sbb/tms/platform/springbootstarter => community/solace/spring/cloud}/requestreply/service/RequestReplyAutoConfiguration.java (92%) rename src/main/java/{ch/sbb/tms/platform/springbootstarter => community/solace/spring/cloud}/requestreply/service/RequestReplyService.java (97%) rename src/main/java/{ch/sbb/tms/platform/springbootstarter => community/solace/spring/cloud}/requestreply/service/RequestReplyServiceImpl.java (96%) rename src/main/java/{ch/sbb/tms/platform/springbootstarter => community/solace/spring/cloud}/requestreply/service/ResponseHandler.java (93%) rename src/main/java/{ch/sbb/tms/platform/springbootstarter => community/solace/spring/cloud}/requestreply/service/header/RequestReplyMessageHeaderSupportService.java (93%) rename src/main/java/{ch/sbb/tms/platform/springbootstarter => community/solace/spring/cloud}/requestreply/service/header/parser/BinderHeaderParser.java (69%) rename src/main/java/{ch/sbb/tms/platform/springbootstarter => community/solace/spring/cloud}/requestreply/service/header/parser/HttpHeaderParser.java (72%) rename src/main/java/{ch/sbb/tms/platform/springbootstarter => community/solace/spring/cloud}/requestreply/service/header/parser/SolaceHeaderParser.java (67%) rename src/main/java/{ch/sbb/tms/platform/springbootstarter => community/solace/spring/cloud}/requestreply/service/header/parser/SpringCloudStreamHeaderParser.java (77%) rename src/main/java/{ch/sbb/tms/platform/springbootstarter => community/solace/spring/cloud}/requestreply/service/header/parser/SpringHeaderParser.java (79%) rename src/main/java/{ch/sbb/tms/platform/springbootstarter => community/solace/spring/cloud}/requestreply/service/header/parser/SpringIntegrationHeaderParser.java (73%) rename src/main/java/{ch/sbb/tms/platform/springbootstarter => community/solace/spring/cloud}/requestreply/service/header/parser/correlationid/MessageCorrelationIdParser.java (76%) rename src/main/java/{ch/sbb/tms/platform/springbootstarter => community/solace/spring/cloud}/requestreply/service/header/parser/correlationid/MessageHeaderCorrelationIdParser.java (86%) rename src/main/java/{ch/sbb/tms/platform/springbootstarter => community/solace/spring/cloud}/requestreply/service/header/parser/destination/MessageDestinationParser.java (69%) rename src/main/java/{ch/sbb/tms/platform/springbootstarter => community/solace/spring/cloud}/requestreply/service/header/parser/destination/MessageHeaderDestinationParser.java (84%) rename src/main/java/{ch/sbb/tms/platform/springbootstarter => community/solace/spring/cloud}/requestreply/service/header/parser/errormessage/MessageErrorMessageParser.java (69%) rename src/main/java/{ch/sbb/tms/platform/springbootstarter => community/solace/spring/cloud}/requestreply/service/header/parser/errormessage/MessageHeaderErrorMessageParser.java (84%) rename src/main/java/{ch/sbb/tms/platform/springbootstarter => community/solace/spring/cloud}/requestreply/service/header/parser/errormessage/RemoteErrorException.java (60%) rename src/main/java/{ch/sbb/tms/platform/springbootstarter => community/solace/spring/cloud}/requestreply/service/header/parser/replyto/MessageHeaderReplyToParser.java (84%) rename src/main/java/{ch/sbb/tms/platform/springbootstarter => community/solace/spring/cloud}/requestreply/service/header/parser/replyto/MessageReplyToParser.java (70%) rename src/main/java/{ch/sbb/tms/platform/springbootstarter => community/solace/spring/cloud}/requestreply/service/header/parser/totalreplies/MessageHeaderTotalRepliesParser.java (84%) rename src/main/java/{ch/sbb/tms/platform/springbootstarter => community/solace/spring/cloud}/requestreply/service/header/parser/totalreplies/MessageTotalRepliesParser.java (69%) rename src/main/java/{ch/sbb/tms/platform/springbootstarter => community/solace/spring/cloud}/requestreply/util/CheckedExceptionWrapper.java (91%) rename src/main/java/{ch/sbb/tms/platform/springbootstarter => community/solace/spring/cloud}/requestreply/util/MessageChunker.java (94%) rename src/test/java/{ch/sbb/tms/platform/springbootstarter => community/solace/spring/cloud}/requestreply/AbstractRequestReplyIT.java (84%) rename src/test/java/{ch/sbb/tms/platform/springbootstarter => community/solace/spring/cloud}/requestreply/integration/support/RequestReplyMessageHeaderSupportServiceTest.java (92%) rename src/test/java/{ch/sbb/tms/platform/springbootstarter => community/solace/spring/cloud}/requestreply/model/SensorReading.java (96%) rename src/test/java/{ch/sbb/tms/platform/sampleapp/springbootstarter/requestreply => community/solace/spring/cloud/requestreply/sampleapp}/RequestReplyTestApplication.java (87%) rename src/test/java/{ch/sbb/tms/platform/sampleapp/springbootstarter/requestreply => community/solace/spring/cloud/requestreply/sampleapp}/configuration/RequestReplyTestConfiguration.java (77%) rename src/test/java/{ch/sbb/tms/platform/sampleapp/springbootstarter/requestreply => community/solace/spring/cloud/requestreply/sampleapp}/controller/RequestReplyController.java (79%) rename src/test/java/{ch/sbb/tms/platform/sampleapp/springbootstarter/requestreply => community/solace/spring/cloud/requestreply/sampleapp}/integration/RequestReplyTestEndpoint.java (96%) rename src/test/java/{ch/sbb/tms/platform/springbootstarter => community/solace/spring/cloud}/requestreply/service/HeaderParserTests.java (78%) rename src/test/java/{ch/sbb/tms/platform/springbootstarter => community/solace/spring/cloud}/requestreply/service/RequestReplyServiceTests.java (98%) rename src/test/java/{ch/sbb/tms/platform/springbootstarter => community/solace/spring/cloud}/requestreply/service/header/RequestReplyMessageHeaderSupportServiceTests.java (98%) rename src/test/java/{ch/sbb/tms/platform/springbootstarter => community/solace/spring/cloud}/requestreply/service/header/parser/BinderHeaderParserTests.java (89%) rename src/test/java/{ch/sbb/tms/platform/springbootstarter => community/solace/spring/cloud}/requestreply/service/header/parser/SpringCloudStreamHeaderParserTests.java (88%) rename src/test/java/{ch/sbb/tms/platform/springbootstarter => community/solace/spring/cloud}/requestreply/util/CheckedExceptionWrapperTest.java (93%) diff --git a/.github/workflows/ossrhDeploy.yml b/.github/workflows/ossrhDeploy.yml new file mode 100644 index 0000000..e1cb374 --- /dev/null +++ b/.github/workflows/ossrhDeploy.yml @@ -0,0 +1,32 @@ +name: Publish package to the Maven Central Repository +on: + release: + types: [created] +jobs: + publish: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - name: Set up Maven Central Repository + uses: actions/setup-java@v1 + with: + java-version: 17 + server-id: ossrh + server-username: MAVEN_USERNAME + server-password: MAVEN_PASSWORD + - id: install-secret-key + name: Install gpg secret key + run: | + cat <(echo -e "${{ secrets.OSSRH_GPG_SECRET_KEY }}") | gpg --batch --import + gpg --list-secret-keys --keyid-format LONG + - id: publish-to-central + name: Publish to Central Repository + env: + MAVEN_USERNAME: ${{ secrets.OSSRH_USERNAME }} + MAVEN_PASSWORD: ${{ secrets.OSSRH_PASSWORD }} + run: | + mvn \ + --no-transfer-progress \ + --batch-mode \ + -Dgpg.passphrase=${{ secrets.OSSRH_GPG_SECRET_KEY_PASSWORD }} \ + clean deploy diff --git a/CHANGELOG.md b/CHANGELOG.md index ea74fac..32efce4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,8 +4,26 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). -## Unreleased -- STTRS-1127: support to send grouped multi response +## 5.0.0 - 2023-06-05 +### Changed +- Support for spring 3 +- Rename packages caused by hand over to solace community + +### Added +_n/a_ + +### Removed +- Support for spring 2 + +## 4.0.0 - 2023-05-30 +### Changed +_n/a_ + +### Added +- STTRS-1127: support to send grouped multi response + +### Removed +_n/a_ ## 3.4.0 - 2023-05-10 ### Changed diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md new file mode 100644 index 0000000..d37607e --- /dev/null +++ b/CODE_OF_CONDUCT.md @@ -0,0 +1,132 @@ +# Contributor Covenant Code of Conduct + +## Our Pledge + +We as members, contributors, and leaders pledge to make participation in our +community a harassment-free experience for everyone, regardless of age, body +size, visible or invisible disability, ethnicity, sex characteristics, gender +identity and expression, level of experience, education, socio-economic status, +nationality, personal appearance, race, religion, or sexual identity +and orientation. + +We pledge to act and interact in ways that contribute to an open, welcoming, +diverse, inclusive, and healthy community. + +## Our Standards + +Examples of behavior that contributes to a positive environment for our +community include: + +* Demonstrating empathy and kindness toward other people +* Being respectful of differing opinions, viewpoints, and experiences +* Giving and gracefully accepting constructive feedback +* Accepting responsibility and apologizing to those affected by our mistakes, + and learning from the experience +* Focusing on what is best not just for us as individuals, but for the + overall community + +Examples of unacceptable behavior include: + +* The use of sexualized language or imagery, and sexual attention or + advances of any kind +* Trolling, insulting or derogatory comments, and personal or political attacks +* Public or private harassment +* Publishing others' private information, such as a physical or email + address, without their explicit permission +* Other conduct which could reasonably be considered inappropriate in a + professional setting + +## Enforcement Responsibilities + +Community leaders are responsible for clarifying and enforcing our standards of +acceptable behavior and will take appropriate and fair corrective action in +response to any behavior that they deem inappropriate, threatening, offensive, +or harmful. + +Community leaders have the right and responsibility to remove, edit, or reject +comments, commits, code, wiki edits, issues, and other contributions that are +not aligned to this Code of Conduct, and will communicate reasons for moderation +decisions when appropriate. + +## Scope + +This Code of Conduct applies within all community spaces, and also applies when +an individual is officially representing the community in public spaces. +Examples of representing our community include using an official e-mail address, +posting via an official social media account, or acting as an appointed +representative at an online or offline event. + +## Enforcement + +Instances of abusive, harassing, or otherwise unacceptable behavior may be +reported to the community leaders responsible for enforcement at +community-github@solace.com. +All complaints will be reviewed and investigated promptly and fairly. + +All community leaders are obligated to respect the privacy and security of the +reporter of any incident. + +## Enforcement Guidelines + +Community leaders will follow these Community Impact Guidelines in determining +the consequences for any action they deem in violation of this Code of Conduct: + +### 1. Correction + +**Community Impact**: Use of inappropriate language or other behavior deemed +unprofessional or unwelcome in the community. + +**Consequence**: A private, written warning from community leaders, providing +clarity around the nature of the violation and an explanation of why the +behavior was inappropriate. A public apology may be requested. + +### 2. Warning + +**Community Impact**: A violation through a single incident or series +of actions. + +**Consequence**: A warning with consequences for continued behavior. No +interaction with the people involved, including unsolicited interaction with +those enforcing the Code of Conduct, for a specified period of time. This +includes avoiding interactions in community spaces as well as external channels +like social media. Violating these terms may lead to a temporary or +permanent ban. + +### 3. Temporary Ban + +**Community Impact**: A serious violation of community standards, including +sustained inappropriate behavior. + +**Consequence**: A temporary ban from any sort of interaction or public +communication with the community for a specified period of time. No public or +private interaction with the people involved, including unsolicited interaction +with those enforcing the Code of Conduct, is allowed during this period. +Violating these terms may lead to a permanent ban. + +### 4. Permanent Ban + +**Community Impact**: Demonstrating a pattern of violation of community +standards, including sustained inappropriate behavior, harassment of an +individual, or aggression toward or disparagement of classes of individuals. + +**Consequence**: A permanent ban from any sort of public interaction within +the community. + +## Attribution + +This Code of Conduct is adapted from the [Contributor Covenant][homepage], +version 2.0, available at +[https://www.contributor-covenant.org/version/2/0/code_of_conduct.html][v2.0]. + +Community Impact Guidelines were inspired by +[Mozilla's code of conduct enforcement ladder][Mozilla CoC]. + +For answers to common questions about this code of conduct, see the FAQ at +[https://www.contributor-covenant.org/faq][FAQ]. Translations are available +at [https://www.contributor-covenant.org/translations][translations]. + +[homepage]: https://www.contributor-covenant.org +[v2.0]: https://www.contributor-covenant.org/version/2/0/code_of_conduct.html +[Mozilla CoC]: https://github.com/mozilla/diversity +[FAQ]: https://www.contributor-covenant.org/faq +[translations]: https://www.contributor-covenant.org/translations diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md new file mode 100644 index 0000000..86e9faa --- /dev/null +++ b/CONTRIBUTING.md @@ -0,0 +1,100 @@ +# How to contribute + +We'd love for you to contribute and welcome your help. Here are some guidelines to follow: + +- [Issues and Bugs](#issue) +- [Submitting a fix](#submitting) +- [Feature Requests](#features) +- [Questions](#questions) + +## Did you find a issue? + +* **Ensure the bug was not already reported** by searching on GitHub under *Issues* + +* If you're unable to find an open issue addressing the problem, open a new one + +## Did you write a patch that fixes a bug? + +Open a new GitHub pull request with the patch following the steps outlined below. Ensure the PR description clearly describes the problem and solution. Include the relevant issue number if applicable. + +Before you submit your pull request consider the following guidelines: + +* Search *Pull Requests* for an open or closed Pull Request + that relates to your submission. You don't want to duplicate effort. + +### Submitting a Pull Request + +Please follow these steps for all pull requests. These steps are derived from the [GitHub flow](https://help.github.com/articles/github-flow/). + +#### Step 1: Fork + +Fork the current repository and clone your fork +locally. + +```sh +git clone https://github.com/solacecommunity/ +``` + +#### Step 2: Branch + +Make your changes on a new git branch in your fork of the repository. + +```sh +git checkout -b my-fix-branch master +``` + +#### Step 3: Commit + +Commit your changes using a descriptive commit message. + +```sh +git commit -a -m "Your Commit Message" +``` + +Note: the optional commit `-a` command line option will automatically "add" and "rm" edited files. + +#### Step 4: Rebase (if possible) + +Assuming you have not yet pushed your branch to origin, use `git rebase` (not `git merge`) to synchronize your work with the main +repository. + +```sh +$ git fetch upstream +$ git rebase upstream/master +``` + +If you have not set the upstream, do so as follows: + +```sh +$ git remote add upstream https://github.com/solacecommunity/ +``` + +If you have already pushed your fork, then do not rebase. Instead merge any changes from master that are not already part of your branch. + +#### Step 5: Push + +Push your branch to your fork in GitHub: + +```sh +git push origin my-fix-branch +``` + +#### Step 6: Pull Request + +In GitHub, send a pull request to `:master`. + +When fixing an existing issue, use the [commit message keywords](https://help.github.com/articles/closing-issues-via-commit-messages/) to close the associated GitHub issue. + +* If we suggest changes then: + * Make the required updates. + * Commit these changes to your branch (ex: my-fix-branch) + +That's it! Thank you for your contribution! + +## **Do you have an ideas for a new feature or a change to an existing one?** + +* Open a GitHub issue and label it as an *enhancement* and describe the new functionality. + +## Do you have questions about the source code? + +* Ask any question about the code or how to use Solace technologies in the [Solace community](https://solace.community). diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..367b7fa --- /dev/null +++ b/LICENSE @@ -0,0 +1,21 @@ +MIT License + +Copyright (c) 2020 Solace Community + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. \ No newline at end of file diff --git a/README.md b/README.md index e6161bb..25954e6 100644 --- a/README.md +++ b/README.md @@ -8,8 +8,8 @@ In order to be able to use the request/reply functionality, add the following se ```xml - ch.sbb.tms.platform - spring-boot-starter-request-reply + community.solace.spring.cloud + spring-cloud-stream-starter-request-reply ``` diff --git a/estaTektonPipeline.json b/estaTektonPipeline.json deleted file mode 100644 index f246f2c..0000000 --- a/estaTektonPipeline.json +++ /dev/null @@ -1,53 +0,0 @@ - -{ - "$schema": "https://clew-resources.sbb-cloud.net/tekton-schema.json", - "productName": "spring-boot-starter-request-reply", - "mvn": { - "parentPom": "pom.xml", - "deployableArtifactsPom": "pom.xml" - }, - "pipelines": [ - { - "name": "continuous", - "triggerType": [ - "GITEVENT", - "USER" - ], - "branchNamePrefixes": [ - "master", - "feature" - ], - "build": { - "buildDockerImage": false, - "deployDockerImage": false, - "sonarScan": { - "enabled": true - } - }, - "stages": [] - }, - { - "name": "release", - "triggerType": [ - "GITEVENT" - ], - "versionTagEventPatterns": [ - "^(\\d+\\.)?(\\d+\\.)?(\\*|\\d+)$" - ], - "build": { - "buildDockerImage": false - }, - "stages": [ - "dev" - ] - } - ], - "notifications": [ - { - "type": "EMAIL", - "eventTypes": ["FAILURE"], - "recipients": ["$actor"] - } - ], - "stages": [] -} diff --git a/pom.xml b/pom.xml index 56e9f95..de475ba 100644 --- a/pom.xml +++ b/pom.xml @@ -8,28 +8,51 @@ - ch.sbb.tms.platform - spring-boot-starter-request-reply + community.solace.spring.cloud + spring-cloud-stream-starter-request-reply 5.0.0-SNAPSHOT - spring-boot-starter-request-reply + spring-cloud-stream-starter-request-reply Spring Boot Starter project to provide request and reply functionality to Spring Cloud Stream projects 17 + 3.1.0 3.0.0 2022.0.3 1.2 - - ${project.groupId}:${project.artifactId} - ${project.groupId}:${project.artifactId} - - ${env.GIT_BRANCH} - ${java.version} - 0.8.10 + + + MIT License + https://github.com/solacecommunity/spring-solace-leader-election/blob/master/LICENSE + repo + + + + + + Solace Community + community-github@solace.com + Solace Community + https://solace.community + + + + + Solace Community + https://solace.community + + + + https://github.com/solacecommunity/spring-cloud-stream-request-reply.git + scm:git:git://github.com/solacecommunity/spring-cloud-stream-request-reply.git + scm:git:git@github.com/solacecommunity/spring-cloud-stream-request-reply.git + HEAD + + @@ -158,12 +181,86 @@ - + + org.codehaus.mojo + templating-maven-plugin + 1.0.0 + + + generate-templated-sources + generate-sources + + filter-sources + + + + + + org.codehaus.mojo + build-helper-maven-plugin + 3.2.0 + + + add-generated-sources + generate-sources + + add-source + + + + ${basedir}/target/generated-sources/java-templates + + + + + + + org.apache.maven.plugins + maven-release-plugin + 2.5.1 + + @{project.version} + + + + org.apache.maven.shared + maven-invoker + 2.2 + + + + + + org.springframework.boot + spring-boot-maven-plugin + ${spring.boot.version} + + true + + + + org.apache.maven.plugins + maven-javadoc-plugin + 2.10.4 + + + attach-javadocs + + jar + + + + + 17 + false + + org.apache.maven.plugins maven-source-plugin + 3.3.0 attach-sources @@ -174,31 +271,36 @@ - org.jacoco - jacoco-maven-plugin - ${jacoco-maven-plugin.version} + org.codehaus.mojo + flatten-maven-plugin + 1.5.0 + + true + oss + + remove + remove + + + - default-prepare-agent + flatten + process-resources - prepare-agent + flatten + - default-report + flatten.clean + clean - report + clean - - - - scm:git:https://${git.username}:${git.password}@code.sbb.ch/scm/pt_tms_plattform/spring-boot-starter-request-reply.git - - HEAD - diff --git a/src/main/java/ch/sbb/tms/platform/springbootstarter/requestreply/config/BinderTopicMappings.java b/src/main/java/community/solace/spring/cloud/requestreply/config/BinderTopicMappings.java similarity index 93% rename from src/main/java/ch/sbb/tms/platform/springbootstarter/requestreply/config/BinderTopicMappings.java rename to src/main/java/community/solace/spring/cloud/requestreply/config/BinderTopicMappings.java index b0139a5..5f02f16 100644 --- a/src/main/java/ch/sbb/tms/platform/springbootstarter/requestreply/config/BinderTopicMappings.java +++ b/src/main/java/community/solace/spring/cloud/requestreply/config/BinderTopicMappings.java @@ -1,4 +1,4 @@ -package ch.sbb.tms.platform.springbootstarter.requestreply.config; +package community.solace.spring.cloud.requestreply.config; import java.util.Collections; import java.util.List; diff --git a/src/main/java/ch/sbb/tms/platform/springbootstarter/requestreply/config/RequestReplyProperties.java b/src/main/java/community/solace/spring/cloud/requestreply/config/RequestReplyProperties.java similarity index 97% rename from src/main/java/ch/sbb/tms/platform/springbootstarter/requestreply/config/RequestReplyProperties.java rename to src/main/java/community/solace/spring/cloud/requestreply/config/RequestReplyProperties.java index 6da6142..afb1516 100644 --- a/src/main/java/ch/sbb/tms/platform/springbootstarter/requestreply/config/RequestReplyProperties.java +++ b/src/main/java/community/solace/spring/cloud/requestreply/config/RequestReplyProperties.java @@ -1,4 +1,4 @@ -package ch.sbb.tms.platform.springbootstarter.requestreply.config; +package community.solace.spring.cloud.requestreply.config; import java.util.ArrayList; import java.util.Collections; diff --git a/src/main/java/ch/sbb/tms/platform/springbootstarter/requestreply/env/ReplyTopicWithWildcardPropertySourceEnvironmentPostProcessor.java b/src/main/java/community/solace/spring/cloud/requestreply/env/ReplyTopicWithWildcardPropertySourceEnvironmentPostProcessor.java similarity index 83% rename from src/main/java/ch/sbb/tms/platform/springbootstarter/requestreply/env/ReplyTopicWithWildcardPropertySourceEnvironmentPostProcessor.java rename to src/main/java/community/solace/spring/cloud/requestreply/env/ReplyTopicWithWildcardPropertySourceEnvironmentPostProcessor.java index 6a3be60..2ea67b9 100644 --- a/src/main/java/ch/sbb/tms/platform/springbootstarter/requestreply/env/ReplyTopicWithWildcardPropertySourceEnvironmentPostProcessor.java +++ b/src/main/java/community/solace/spring/cloud/requestreply/env/ReplyTopicWithWildcardPropertySourceEnvironmentPostProcessor.java @@ -1,7 +1,4 @@ -package ch.sbb.tms.platform.springbootstarter.requestreply.env; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +package community.solace.spring.cloud.requestreply.env; import org.springframework.boot.SpringApplication; import org.springframework.boot.env.EnvironmentPostProcessor; diff --git a/src/main/java/ch/sbb/tms/platform/springbootstarter/requestreply/env/ReplyTopicWithWildcards.java b/src/main/java/community/solace/spring/cloud/requestreply/env/ReplyTopicWithWildcards.java similarity index 79% rename from src/main/java/ch/sbb/tms/platform/springbootstarter/requestreply/env/ReplyTopicWithWildcards.java rename to src/main/java/community/solace/spring/cloud/requestreply/env/ReplyTopicWithWildcards.java index 0f779ed..5381837 100644 --- a/src/main/java/ch/sbb/tms/platform/springbootstarter/requestreply/env/ReplyTopicWithWildcards.java +++ b/src/main/java/community/solace/spring/cloud/requestreply/env/ReplyTopicWithWildcards.java @@ -1,7 +1,7 @@ -package ch.sbb.tms.platform.springbootstarter.requestreply.env; +package community.solace.spring.cloud.requestreply.env; -import ch.sbb.tms.platform.springbootstarter.requestreply.config.BinderTopicMappings; -import ch.sbb.tms.platform.springbootstarter.requestreply.config.RequestReplyProperties; +import community.solace.spring.cloud.requestreply.config.BinderTopicMappings; +import community.solace.spring.cloud.requestreply.config.RequestReplyProperties; import org.springframework.boot.context.properties.bind.Binder; import org.springframework.core.env.ConfigurableEnvironment; diff --git a/src/main/java/ch/sbb/tms/platform/springbootstarter/requestreply/env/ReplyTopicWithWildcardsPropertySource.java b/src/main/java/community/solace/spring/cloud/requestreply/env/ReplyTopicWithWildcardsPropertySource.java similarity index 97% rename from src/main/java/ch/sbb/tms/platform/springbootstarter/requestreply/env/ReplyTopicWithWildcardsPropertySource.java rename to src/main/java/community/solace/spring/cloud/requestreply/env/ReplyTopicWithWildcardsPropertySource.java index c4b03f8..ac5c348 100644 --- a/src/main/java/ch/sbb/tms/platform/springbootstarter/requestreply/env/ReplyTopicWithWildcardsPropertySource.java +++ b/src/main/java/community/solace/spring/cloud/requestreply/env/ReplyTopicWithWildcardsPropertySource.java @@ -1,4 +1,4 @@ -package ch.sbb.tms.platform.springbootstarter.requestreply.env; +package community.solace.spring.cloud.requestreply.env; import java.util.Objects; import java.util.UUID; diff --git a/src/main/java/ch/sbb/tms/platform/springbootstarter/requestreply/exception/RequestReplyException.java b/src/main/java/community/solace/spring/cloud/requestreply/exception/RequestReplyException.java similarity index 78% rename from src/main/java/ch/sbb/tms/platform/springbootstarter/requestreply/exception/RequestReplyException.java rename to src/main/java/community/solace/spring/cloud/requestreply/exception/RequestReplyException.java index b5d4c3d..c2b0ec0 100644 --- a/src/main/java/ch/sbb/tms/platform/springbootstarter/requestreply/exception/RequestReplyException.java +++ b/src/main/java/community/solace/spring/cloud/requestreply/exception/RequestReplyException.java @@ -2,7 +2,7 @@ * Copyright © Schweizerische Bundesbahnen SBB, 2021. */ -package ch.sbb.tms.platform.springbootstarter.requestreply.exception; +package community.solace.spring.cloud.requestreply.exception; public class RequestReplyException extends RuntimeException { private static final long serialVersionUID = 1L; diff --git a/src/main/java/ch/sbb/tms/platform/springbootstarter/requestreply/service/MessageConverter.java b/src/main/java/community/solace/spring/cloud/requestreply/service/MessageConverter.java similarity index 97% rename from src/main/java/ch/sbb/tms/platform/springbootstarter/requestreply/service/MessageConverter.java rename to src/main/java/community/solace/spring/cloud/requestreply/service/MessageConverter.java index 5c6531a..d1ff01b 100644 --- a/src/main/java/ch/sbb/tms/platform/springbootstarter/requestreply/service/MessageConverter.java +++ b/src/main/java/community/solace/spring/cloud/requestreply/service/MessageConverter.java @@ -1,4 +1,4 @@ -package ch.sbb.tms.platform.springbootstarter.requestreply.service; +package community.solace.spring.cloud.requestreply.service; import java.util.HashMap; diff --git a/src/main/java/ch/sbb/tms/platform/springbootstarter/requestreply/service/RequestReplyAutoConfiguration.java b/src/main/java/community/solace/spring/cloud/requestreply/service/RequestReplyAutoConfiguration.java similarity index 92% rename from src/main/java/ch/sbb/tms/platform/springbootstarter/requestreply/service/RequestReplyAutoConfiguration.java rename to src/main/java/community/solace/spring/cloud/requestreply/service/RequestReplyAutoConfiguration.java index 1c79e65..e0a1e0e 100644 --- a/src/main/java/ch/sbb/tms/platform/springbootstarter/requestreply/service/RequestReplyAutoConfiguration.java +++ b/src/main/java/community/solace/spring/cloud/requestreply/service/RequestReplyAutoConfiguration.java @@ -2,12 +2,12 @@ * Copyright © Schweizerische Bundesbahnen SBB, 2021. */ -package ch.sbb.tms.platform.springbootstarter.requestreply.service; +package community.solace.spring.cloud.requestreply.service; import java.util.function.Consumer; -import ch.sbb.tms.platform.springbootstarter.requestreply.config.RequestReplyProperties; -import ch.sbb.tms.platform.springbootstarter.requestreply.service.header.parser.SolaceHeaderParser; +import community.solace.spring.cloud.requestreply.config.RequestReplyProperties; +import community.solace.spring.cloud.requestreply.service.header.parser.SolaceHeaderParser; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -35,7 +35,7 @@ @Configuration @ConditionalOnClass({MessageChannel.class}) -@ComponentScan("ch.sbb.tms.platform.springbootstarter.requestreply.service") +@ComponentScan("community.solace.spring.cloud.requestreply.service") @AutoConfigureAfter({ ContextFunctionCatalogAutoConfiguration.class, PropertySourcesPlaceholderConfigurer.class, diff --git a/src/main/java/ch/sbb/tms/platform/springbootstarter/requestreply/service/RequestReplyService.java b/src/main/java/community/solace/spring/cloud/requestreply/service/RequestReplyService.java similarity index 97% rename from src/main/java/ch/sbb/tms/platform/springbootstarter/requestreply/service/RequestReplyService.java rename to src/main/java/community/solace/spring/cloud/requestreply/service/RequestReplyService.java index 7a93da0..7e1e09a 100644 --- a/src/main/java/ch/sbb/tms/platform/springbootstarter/requestreply/service/RequestReplyService.java +++ b/src/main/java/community/solace/spring/cloud/requestreply/service/RequestReplyService.java @@ -1,4 +1,4 @@ -package ch.sbb.tms.platform.springbootstarter.requestreply.service; +package community.solace.spring.cloud.requestreply.service; import java.time.Duration; import java.util.concurrent.CompletableFuture; @@ -8,7 +8,7 @@ import jakarta.validation.constraints.NotEmpty; import jakarta.validation.constraints.NotNull; -import ch.sbb.tms.platform.springbootstarter.requestreply.service.header.parser.errormessage.RemoteErrorException; +import community.solace.spring.cloud.requestreply.service.header.parser.errormessage.RemoteErrorException; import reactor.core.publisher.Flux; public interface RequestReplyService { diff --git a/src/main/java/ch/sbb/tms/platform/springbootstarter/requestreply/service/RequestReplyServiceImpl.java b/src/main/java/community/solace/spring/cloud/requestreply/service/RequestReplyServiceImpl.java similarity index 96% rename from src/main/java/ch/sbb/tms/platform/springbootstarter/requestreply/service/RequestReplyServiceImpl.java rename to src/main/java/community/solace/spring/cloud/requestreply/service/RequestReplyServiceImpl.java index c016403..67801f4 100644 --- a/src/main/java/ch/sbb/tms/platform/springbootstarter/requestreply/service/RequestReplyServiceImpl.java +++ b/src/main/java/community/solace/spring/cloud/requestreply/service/RequestReplyServiceImpl.java @@ -1,4 +1,4 @@ -package ch.sbb.tms.platform.springbootstarter.requestreply.service; +package community.solace.spring.cloud.requestreply.service; import java.nio.charset.StandardCharsets; import java.time.Duration; @@ -21,11 +21,11 @@ import jakarta.validation.constraints.NotEmpty; import jakarta.validation.constraints.NotNull; -import ch.sbb.tms.platform.springbootstarter.requestreply.config.RequestReplyProperties; -import ch.sbb.tms.platform.springbootstarter.requestreply.exception.RequestReplyException; -import ch.sbb.tms.platform.springbootstarter.requestreply.service.header.RequestReplyMessageHeaderSupportService; -import ch.sbb.tms.platform.springbootstarter.requestreply.service.header.parser.SpringHeaderParser; -import ch.sbb.tms.platform.springbootstarter.requestreply.service.header.parser.errormessage.RemoteErrorException; +import community.solace.spring.cloud.requestreply.config.RequestReplyProperties; +import community.solace.spring.cloud.requestreply.exception.RequestReplyException; +import community.solace.spring.cloud.requestreply.service.header.RequestReplyMessageHeaderSupportService; +import community.solace.spring.cloud.requestreply.service.header.parser.SpringHeaderParser; +import community.solace.spring.cloud.requestreply.service.header.parser.errormessage.RemoteErrorException; import com.solacesystems.jcsmp.SDTException; import com.solacesystems.jcsmp.SDTStream; import org.jetbrains.annotations.Nullable; @@ -47,7 +47,7 @@ import org.springframework.stereotype.Service; import org.springframework.util.StringUtils; -import static ch.sbb.tms.platform.springbootstarter.requestreply.util.CheckedExceptionWrapper.throwingUnchecked; +import static community.solace.spring.cloud.requestreply.util.CheckedExceptionWrapper.throwingUnchecked; /** * The RequestReplyService takes care of asynchronous request and reply messages, relating one to the other and allowing to wrap both as a synchronous call. diff --git a/src/main/java/ch/sbb/tms/platform/springbootstarter/requestreply/service/ResponseHandler.java b/src/main/java/community/solace/spring/cloud/requestreply/service/ResponseHandler.java similarity index 93% rename from src/main/java/ch/sbb/tms/platform/springbootstarter/requestreply/service/ResponseHandler.java rename to src/main/java/community/solace/spring/cloud/requestreply/service/ResponseHandler.java index 3840637..6b2846e 100644 --- a/src/main/java/ch/sbb/tms/platform/springbootstarter/requestreply/service/ResponseHandler.java +++ b/src/main/java/community/solace/spring/cloud/requestreply/service/ResponseHandler.java @@ -1,10 +1,10 @@ -package ch.sbb.tms.platform.springbootstarter.requestreply.service; +package community.solace.spring.cloud.requestreply.service; import java.util.concurrent.CountDownLatch; import java.util.concurrent.atomic.AtomicLong; import java.util.function.Consumer; -import ch.sbb.tms.platform.springbootstarter.requestreply.service.header.parser.errormessage.RemoteErrorException; +import community.solace.spring.cloud.requestreply.service.header.parser.errormessage.RemoteErrorException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/ch/sbb/tms/platform/springbootstarter/requestreply/service/header/RequestReplyMessageHeaderSupportService.java b/src/main/java/community/solace/spring/cloud/requestreply/service/header/RequestReplyMessageHeaderSupportService.java similarity index 93% rename from src/main/java/ch/sbb/tms/platform/springbootstarter/requestreply/service/header/RequestReplyMessageHeaderSupportService.java rename to src/main/java/community/solace/spring/cloud/requestreply/service/header/RequestReplyMessageHeaderSupportService.java index f196594..eb902af 100644 --- a/src/main/java/ch/sbb/tms/platform/springbootstarter/requestreply/service/header/RequestReplyMessageHeaderSupportService.java +++ b/src/main/java/community/solace/spring/cloud/requestreply/service/header/RequestReplyMessageHeaderSupportService.java @@ -1,4 +1,4 @@ -package ch.sbb.tms.platform.springbootstarter.requestreply.service.header; +package community.solace.spring.cloud.requestreply.service.header; import java.time.Duration; import java.util.ArrayList; @@ -8,15 +8,15 @@ import java.util.function.BiConsumer; import java.util.function.Function; -import ch.sbb.tms.platform.springbootstarter.requestreply.config.RequestReplyProperties; -import ch.sbb.tms.platform.springbootstarter.requestreply.service.MessageConverter; -import ch.sbb.tms.platform.springbootstarter.requestreply.service.header.parser.SpringHeaderParser; -import ch.sbb.tms.platform.springbootstarter.requestreply.service.header.parser.correlationid.MessageCorrelationIdParser; -import ch.sbb.tms.platform.springbootstarter.requestreply.service.header.parser.destination.MessageDestinationParser; -import ch.sbb.tms.platform.springbootstarter.requestreply.service.header.parser.errormessage.MessageErrorMessageParser; -import ch.sbb.tms.platform.springbootstarter.requestreply.service.header.parser.replyto.MessageReplyToParser; -import ch.sbb.tms.platform.springbootstarter.requestreply.service.header.parser.totalreplies.MessageTotalRepliesParser; -import ch.sbb.tms.platform.springbootstarter.requestreply.util.MessageChunker; +import community.solace.spring.cloud.requestreply.config.RequestReplyProperties; +import community.solace.spring.cloud.requestreply.service.MessageConverter; +import community.solace.spring.cloud.requestreply.service.header.parser.SpringHeaderParser; +import community.solace.spring.cloud.requestreply.service.header.parser.correlationid.MessageCorrelationIdParser; +import community.solace.spring.cloud.requestreply.service.header.parser.destination.MessageDestinationParser; +import community.solace.spring.cloud.requestreply.service.header.parser.errormessage.MessageErrorMessageParser; +import community.solace.spring.cloud.requestreply.service.header.parser.replyto.MessageReplyToParser; +import community.solace.spring.cloud.requestreply.service.header.parser.totalreplies.MessageTotalRepliesParser; +import community.solace.spring.cloud.requestreply.util.MessageChunker; import org.apache.commons.lang3.tuple.Pair; import org.jetbrains.annotations.NotNull; import reactor.core.publisher.Flux; diff --git a/src/main/java/ch/sbb/tms/platform/springbootstarter/requestreply/service/header/parser/BinderHeaderParser.java b/src/main/java/community/solace/spring/cloud/requestreply/service/header/parser/BinderHeaderParser.java similarity index 69% rename from src/main/java/ch/sbb/tms/platform/springbootstarter/requestreply/service/header/parser/BinderHeaderParser.java rename to src/main/java/community/solace/spring/cloud/requestreply/service/header/parser/BinderHeaderParser.java index 8ac184e..b6d5e9a 100644 --- a/src/main/java/ch/sbb/tms/platform/springbootstarter/requestreply/service/header/parser/BinderHeaderParser.java +++ b/src/main/java/community/solace/spring/cloud/requestreply/service/header/parser/BinderHeaderParser.java @@ -1,11 +1,11 @@ -package ch.sbb.tms.platform.springbootstarter.requestreply.service.header.parser; +package community.solace.spring.cloud.requestreply.service.header.parser; import org.springframework.cloud.stream.binder.BinderHeaders; import org.springframework.core.annotation.Order; import org.springframework.messaging.MessageHeaders; import org.springframework.stereotype.Service; -import ch.sbb.tms.platform.springbootstarter.requestreply.service.header.parser.destination.MessageHeaderDestinationParser; +import community.solace.spring.cloud.requestreply.service.header.parser.destination.MessageHeaderDestinationParser; @Service @Order(30000) diff --git a/src/main/java/ch/sbb/tms/platform/springbootstarter/requestreply/service/header/parser/HttpHeaderParser.java b/src/main/java/community/solace/spring/cloud/requestreply/service/header/parser/HttpHeaderParser.java similarity index 72% rename from src/main/java/ch/sbb/tms/platform/springbootstarter/requestreply/service/header/parser/HttpHeaderParser.java rename to src/main/java/community/solace/spring/cloud/requestreply/service/header/parser/HttpHeaderParser.java index 127f7b3..c69addd 100644 --- a/src/main/java/ch/sbb/tms/platform/springbootstarter/requestreply/service/header/parser/HttpHeaderParser.java +++ b/src/main/java/community/solace/spring/cloud/requestreply/service/header/parser/HttpHeaderParser.java @@ -1,11 +1,11 @@ -package ch.sbb.tms.platform.springbootstarter.requestreply.service.header.parser; +package community.solace.spring.cloud.requestreply.service.header.parser; import org.springframework.core.Ordered; import org.springframework.core.annotation.Order; import org.springframework.messaging.MessageHeaders; import org.springframework.stereotype.Service; -import ch.sbb.tms.platform.springbootstarter.requestreply.service.header.parser.correlationid.MessageHeaderCorrelationIdParser; +import community.solace.spring.cloud.requestreply.service.header.parser.correlationid.MessageHeaderCorrelationIdParser; @Service @Order(Ordered.LOWEST_PRECEDENCE) diff --git a/src/main/java/ch/sbb/tms/platform/springbootstarter/requestreply/service/header/parser/SolaceHeaderParser.java b/src/main/java/community/solace/spring/cloud/requestreply/service/header/parser/SolaceHeaderParser.java similarity index 67% rename from src/main/java/ch/sbb/tms/platform/springbootstarter/requestreply/service/header/parser/SolaceHeaderParser.java rename to src/main/java/community/solace/spring/cloud/requestreply/service/header/parser/SolaceHeaderParser.java index b67281a..e337493 100644 --- a/src/main/java/ch/sbb/tms/platform/springbootstarter/requestreply/service/header/parser/SolaceHeaderParser.java +++ b/src/main/java/community/solace/spring/cloud/requestreply/service/header/parser/SolaceHeaderParser.java @@ -1,10 +1,10 @@ -package ch.sbb.tms.platform.springbootstarter.requestreply.service.header.parser; +package community.solace.spring.cloud.requestreply.service.header.parser; import java.util.Optional; -import ch.sbb.tms.platform.springbootstarter.requestreply.service.header.parser.correlationid.MessageHeaderCorrelationIdParser; -import ch.sbb.tms.platform.springbootstarter.requestreply.service.header.parser.destination.MessageHeaderDestinationParser; -import ch.sbb.tms.platform.springbootstarter.requestreply.service.header.parser.replyto.MessageHeaderReplyToParser; +import community.solace.spring.cloud.requestreply.service.header.parser.correlationid.MessageHeaderCorrelationIdParser; +import community.solace.spring.cloud.requestreply.service.header.parser.destination.MessageHeaderDestinationParser; +import community.solace.spring.cloud.requestreply.service.header.parser.replyto.MessageHeaderReplyToParser; import com.solace.spring.cloud.stream.binder.messaging.SolaceHeaders; import com.solacesystems.jcsmp.Destination; diff --git a/src/main/java/ch/sbb/tms/platform/springbootstarter/requestreply/service/header/parser/SpringCloudStreamHeaderParser.java b/src/main/java/community/solace/spring/cloud/requestreply/service/header/parser/SpringCloudStreamHeaderParser.java similarity index 77% rename from src/main/java/ch/sbb/tms/platform/springbootstarter/requestreply/service/header/parser/SpringCloudStreamHeaderParser.java rename to src/main/java/community/solace/spring/cloud/requestreply/service/header/parser/SpringCloudStreamHeaderParser.java index 38f1336..c5b72ab 100644 --- a/src/main/java/ch/sbb/tms/platform/springbootstarter/requestreply/service/header/parser/SpringCloudStreamHeaderParser.java +++ b/src/main/java/community/solace/spring/cloud/requestreply/service/header/parser/SpringCloudStreamHeaderParser.java @@ -1,10 +1,10 @@ -package ch.sbb.tms.platform.springbootstarter.requestreply.service.header.parser; +package community.solace.spring.cloud.requestreply.service.header.parser; import org.springframework.core.annotation.Order; import org.springframework.messaging.MessageHeaders; import org.springframework.stereotype.Service; -import ch.sbb.tms.platform.springbootstarter.requestreply.service.header.parser.destination.MessageHeaderDestinationParser; +import community.solace.spring.cloud.requestreply.service.header.parser.destination.MessageHeaderDestinationParser; @Service @Order(10000) diff --git a/src/main/java/ch/sbb/tms/platform/springbootstarter/requestreply/service/header/parser/SpringHeaderParser.java b/src/main/java/community/solace/spring/cloud/requestreply/service/header/parser/SpringHeaderParser.java similarity index 79% rename from src/main/java/ch/sbb/tms/platform/springbootstarter/requestreply/service/header/parser/SpringHeaderParser.java rename to src/main/java/community/solace/spring/cloud/requestreply/service/header/parser/SpringHeaderParser.java index 6a6c683..4a89df0 100644 --- a/src/main/java/ch/sbb/tms/platform/springbootstarter/requestreply/service/header/parser/SpringHeaderParser.java +++ b/src/main/java/community/solace/spring/cloud/requestreply/service/header/parser/SpringHeaderParser.java @@ -1,8 +1,8 @@ -package ch.sbb.tms.platform.springbootstarter.requestreply.service.header.parser; +package community.solace.spring.cloud.requestreply.service.header.parser; -import ch.sbb.tms.platform.springbootstarter.requestreply.service.header.parser.errormessage.MessageHeaderErrorMessageParser; -import ch.sbb.tms.platform.springbootstarter.requestreply.service.header.parser.replyto.MessageHeaderReplyToParser; -import ch.sbb.tms.platform.springbootstarter.requestreply.service.header.parser.totalreplies.MessageHeaderTotalRepliesParser; +import community.solace.spring.cloud.requestreply.service.header.parser.errormessage.MessageHeaderErrorMessageParser; +import community.solace.spring.cloud.requestreply.service.header.parser.replyto.MessageHeaderReplyToParser; +import community.solace.spring.cloud.requestreply.service.header.parser.totalreplies.MessageHeaderTotalRepliesParser; import org.springframework.core.annotation.Order; import org.springframework.messaging.MessageHeaders; diff --git a/src/main/java/ch/sbb/tms/platform/springbootstarter/requestreply/service/header/parser/SpringIntegrationHeaderParser.java b/src/main/java/community/solace/spring/cloud/requestreply/service/header/parser/SpringIntegrationHeaderParser.java similarity index 73% rename from src/main/java/ch/sbb/tms/platform/springbootstarter/requestreply/service/header/parser/SpringIntegrationHeaderParser.java rename to src/main/java/community/solace/spring/cloud/requestreply/service/header/parser/SpringIntegrationHeaderParser.java index 4ed9ad9..e382d96 100644 --- a/src/main/java/ch/sbb/tms/platform/springbootstarter/requestreply/service/header/parser/SpringIntegrationHeaderParser.java +++ b/src/main/java/community/solace/spring/cloud/requestreply/service/header/parser/SpringIntegrationHeaderParser.java @@ -1,4 +1,4 @@ -package ch.sbb.tms.platform.springbootstarter.requestreply.service.header.parser; +package community.solace.spring.cloud.requestreply.service.header.parser; import java.util.Optional; @@ -7,7 +7,7 @@ import org.springframework.messaging.MessageHeaders; import org.springframework.stereotype.Service; -import ch.sbb.tms.platform.springbootstarter.requestreply.service.header.parser.correlationid.MessageHeaderCorrelationIdParser; +import community.solace.spring.cloud.requestreply.service.header.parser.correlationid.MessageHeaderCorrelationIdParser; @Service @Order(20000) diff --git a/src/main/java/ch/sbb/tms/platform/springbootstarter/requestreply/service/header/parser/correlationid/MessageCorrelationIdParser.java b/src/main/java/community/solace/spring/cloud/requestreply/service/header/parser/correlationid/MessageCorrelationIdParser.java similarity index 76% rename from src/main/java/ch/sbb/tms/platform/springbootstarter/requestreply/service/header/parser/correlationid/MessageCorrelationIdParser.java rename to src/main/java/community/solace/spring/cloud/requestreply/service/header/parser/correlationid/MessageCorrelationIdParser.java index 3691bce..8c3f485 100644 --- a/src/main/java/ch/sbb/tms/platform/springbootstarter/requestreply/service/header/parser/correlationid/MessageCorrelationIdParser.java +++ b/src/main/java/community/solace/spring/cloud/requestreply/service/header/parser/correlationid/MessageCorrelationIdParser.java @@ -1,4 +1,4 @@ -package ch.sbb.tms.platform.springbootstarter.requestreply.service.header.parser.correlationid; +package community.solace.spring.cloud.requestreply.service.header.parser.correlationid; import org.springframework.lang.Nullable; import org.springframework.messaging.Message; diff --git a/src/main/java/ch/sbb/tms/platform/springbootstarter/requestreply/service/header/parser/correlationid/MessageHeaderCorrelationIdParser.java b/src/main/java/community/solace/spring/cloud/requestreply/service/header/parser/correlationid/MessageHeaderCorrelationIdParser.java similarity index 86% rename from src/main/java/ch/sbb/tms/platform/springbootstarter/requestreply/service/header/parser/correlationid/MessageHeaderCorrelationIdParser.java rename to src/main/java/community/solace/spring/cloud/requestreply/service/header/parser/correlationid/MessageHeaderCorrelationIdParser.java index 763d22d..1145f68 100644 --- a/src/main/java/ch/sbb/tms/platform/springbootstarter/requestreply/service/header/parser/correlationid/MessageHeaderCorrelationIdParser.java +++ b/src/main/java/community/solace/spring/cloud/requestreply/service/header/parser/correlationid/MessageHeaderCorrelationIdParser.java @@ -1,4 +1,4 @@ -package ch.sbb.tms.platform.springbootstarter.requestreply.service.header.parser.correlationid; +package community.solace.spring.cloud.requestreply.service.header.parser.correlationid; import org.springframework.lang.Nullable; import org.springframework.messaging.Message; diff --git a/src/main/java/ch/sbb/tms/platform/springbootstarter/requestreply/service/header/parser/destination/MessageDestinationParser.java b/src/main/java/community/solace/spring/cloud/requestreply/service/header/parser/destination/MessageDestinationParser.java similarity index 69% rename from src/main/java/ch/sbb/tms/platform/springbootstarter/requestreply/service/header/parser/destination/MessageDestinationParser.java rename to src/main/java/community/solace/spring/cloud/requestreply/service/header/parser/destination/MessageDestinationParser.java index de51671..080cb54 100644 --- a/src/main/java/ch/sbb/tms/platform/springbootstarter/requestreply/service/header/parser/destination/MessageDestinationParser.java +++ b/src/main/java/community/solace/spring/cloud/requestreply/service/header/parser/destination/MessageDestinationParser.java @@ -1,4 +1,4 @@ -package ch.sbb.tms.platform.springbootstarter.requestreply.service.header.parser.destination; +package community.solace.spring.cloud.requestreply.service.header.parser.destination; import org.springframework.lang.Nullable; import org.springframework.messaging.Message; diff --git a/src/main/java/ch/sbb/tms/platform/springbootstarter/requestreply/service/header/parser/destination/MessageHeaderDestinationParser.java b/src/main/java/community/solace/spring/cloud/requestreply/service/header/parser/destination/MessageHeaderDestinationParser.java similarity index 84% rename from src/main/java/ch/sbb/tms/platform/springbootstarter/requestreply/service/header/parser/destination/MessageHeaderDestinationParser.java rename to src/main/java/community/solace/spring/cloud/requestreply/service/header/parser/destination/MessageHeaderDestinationParser.java index 5aa7f39..b282502 100644 --- a/src/main/java/ch/sbb/tms/platform/springbootstarter/requestreply/service/header/parser/destination/MessageHeaderDestinationParser.java +++ b/src/main/java/community/solace/spring/cloud/requestreply/service/header/parser/destination/MessageHeaderDestinationParser.java @@ -1,4 +1,4 @@ -package ch.sbb.tms.platform.springbootstarter.requestreply.service.header.parser.destination; +package community.solace.spring.cloud.requestreply.service.header.parser.destination; import org.springframework.lang.Nullable; import org.springframework.messaging.Message; diff --git a/src/main/java/ch/sbb/tms/platform/springbootstarter/requestreply/service/header/parser/errormessage/MessageErrorMessageParser.java b/src/main/java/community/solace/spring/cloud/requestreply/service/header/parser/errormessage/MessageErrorMessageParser.java similarity index 69% rename from src/main/java/ch/sbb/tms/platform/springbootstarter/requestreply/service/header/parser/errormessage/MessageErrorMessageParser.java rename to src/main/java/community/solace/spring/cloud/requestreply/service/header/parser/errormessage/MessageErrorMessageParser.java index a333495..54ba319 100644 --- a/src/main/java/ch/sbb/tms/platform/springbootstarter/requestreply/service/header/parser/errormessage/MessageErrorMessageParser.java +++ b/src/main/java/community/solace/spring/cloud/requestreply/service/header/parser/errormessage/MessageErrorMessageParser.java @@ -1,4 +1,4 @@ -package ch.sbb.tms.platform.springbootstarter.requestreply.service.header.parser.errormessage; +package community.solace.spring.cloud.requestreply.service.header.parser.errormessage; import org.springframework.lang.Nullable; import org.springframework.messaging.Message; diff --git a/src/main/java/ch/sbb/tms/platform/springbootstarter/requestreply/service/header/parser/errormessage/MessageHeaderErrorMessageParser.java b/src/main/java/community/solace/spring/cloud/requestreply/service/header/parser/errormessage/MessageHeaderErrorMessageParser.java similarity index 84% rename from src/main/java/ch/sbb/tms/platform/springbootstarter/requestreply/service/header/parser/errormessage/MessageHeaderErrorMessageParser.java rename to src/main/java/community/solace/spring/cloud/requestreply/service/header/parser/errormessage/MessageHeaderErrorMessageParser.java index 7f2ddab..68936d3 100644 --- a/src/main/java/ch/sbb/tms/platform/springbootstarter/requestreply/service/header/parser/errormessage/MessageHeaderErrorMessageParser.java +++ b/src/main/java/community/solace/spring/cloud/requestreply/service/header/parser/errormessage/MessageHeaderErrorMessageParser.java @@ -1,4 +1,4 @@ -package ch.sbb.tms.platform.springbootstarter.requestreply.service.header.parser.errormessage; +package community.solace.spring.cloud.requestreply.service.header.parser.errormessage; import org.springframework.lang.Nullable; import org.springframework.messaging.Message; diff --git a/src/main/java/ch/sbb/tms/platform/springbootstarter/requestreply/service/header/parser/errormessage/RemoteErrorException.java b/src/main/java/community/solace/spring/cloud/requestreply/service/header/parser/errormessage/RemoteErrorException.java similarity index 60% rename from src/main/java/ch/sbb/tms/platform/springbootstarter/requestreply/service/header/parser/errormessage/RemoteErrorException.java rename to src/main/java/community/solace/spring/cloud/requestreply/service/header/parser/errormessage/RemoteErrorException.java index c1eaf0f..902ba16 100644 --- a/src/main/java/ch/sbb/tms/platform/springbootstarter/requestreply/service/header/parser/errormessage/RemoteErrorException.java +++ b/src/main/java/community/solace/spring/cloud/requestreply/service/header/parser/errormessage/RemoteErrorException.java @@ -1,4 +1,4 @@ -package ch.sbb.tms.platform.springbootstarter.requestreply.service.header.parser.errormessage; +package community.solace.spring.cloud.requestreply.service.header.parser.errormessage; public class RemoteErrorException extends Exception { diff --git a/src/main/java/ch/sbb/tms/platform/springbootstarter/requestreply/service/header/parser/replyto/MessageHeaderReplyToParser.java b/src/main/java/community/solace/spring/cloud/requestreply/service/header/parser/replyto/MessageHeaderReplyToParser.java similarity index 84% rename from src/main/java/ch/sbb/tms/platform/springbootstarter/requestreply/service/header/parser/replyto/MessageHeaderReplyToParser.java rename to src/main/java/community/solace/spring/cloud/requestreply/service/header/parser/replyto/MessageHeaderReplyToParser.java index 2b09087..973a819 100644 --- a/src/main/java/ch/sbb/tms/platform/springbootstarter/requestreply/service/header/parser/replyto/MessageHeaderReplyToParser.java +++ b/src/main/java/community/solace/spring/cloud/requestreply/service/header/parser/replyto/MessageHeaderReplyToParser.java @@ -1,4 +1,4 @@ -package ch.sbb.tms.platform.springbootstarter.requestreply.service.header.parser.replyto; +package community.solace.spring.cloud.requestreply.service.header.parser.replyto; import org.springframework.lang.Nullable; import org.springframework.messaging.Message; diff --git a/src/main/java/ch/sbb/tms/platform/springbootstarter/requestreply/service/header/parser/replyto/MessageReplyToParser.java b/src/main/java/community/solace/spring/cloud/requestreply/service/header/parser/replyto/MessageReplyToParser.java similarity index 70% rename from src/main/java/ch/sbb/tms/platform/springbootstarter/requestreply/service/header/parser/replyto/MessageReplyToParser.java rename to src/main/java/community/solace/spring/cloud/requestreply/service/header/parser/replyto/MessageReplyToParser.java index 0e435fe..4b9742a 100644 --- a/src/main/java/ch/sbb/tms/platform/springbootstarter/requestreply/service/header/parser/replyto/MessageReplyToParser.java +++ b/src/main/java/community/solace/spring/cloud/requestreply/service/header/parser/replyto/MessageReplyToParser.java @@ -1,4 +1,4 @@ -package ch.sbb.tms.platform.springbootstarter.requestreply.service.header.parser.replyto; +package community.solace.spring.cloud.requestreply.service.header.parser.replyto; import org.springframework.lang.Nullable; import org.springframework.messaging.Message; diff --git a/src/main/java/ch/sbb/tms/platform/springbootstarter/requestreply/service/header/parser/totalreplies/MessageHeaderTotalRepliesParser.java b/src/main/java/community/solace/spring/cloud/requestreply/service/header/parser/totalreplies/MessageHeaderTotalRepliesParser.java similarity index 84% rename from src/main/java/ch/sbb/tms/platform/springbootstarter/requestreply/service/header/parser/totalreplies/MessageHeaderTotalRepliesParser.java rename to src/main/java/community/solace/spring/cloud/requestreply/service/header/parser/totalreplies/MessageHeaderTotalRepliesParser.java index eb7e8e0..2b84dd7 100644 --- a/src/main/java/ch/sbb/tms/platform/springbootstarter/requestreply/service/header/parser/totalreplies/MessageHeaderTotalRepliesParser.java +++ b/src/main/java/community/solace/spring/cloud/requestreply/service/header/parser/totalreplies/MessageHeaderTotalRepliesParser.java @@ -1,4 +1,4 @@ -package ch.sbb.tms.platform.springbootstarter.requestreply.service.header.parser.totalreplies; +package community.solace.spring.cloud.requestreply.service.header.parser.totalreplies; import org.springframework.lang.Nullable; import org.springframework.messaging.Message; diff --git a/src/main/java/ch/sbb/tms/platform/springbootstarter/requestreply/service/header/parser/totalreplies/MessageTotalRepliesParser.java b/src/main/java/community/solace/spring/cloud/requestreply/service/header/parser/totalreplies/MessageTotalRepliesParser.java similarity index 69% rename from src/main/java/ch/sbb/tms/platform/springbootstarter/requestreply/service/header/parser/totalreplies/MessageTotalRepliesParser.java rename to src/main/java/community/solace/spring/cloud/requestreply/service/header/parser/totalreplies/MessageTotalRepliesParser.java index f8d9312..786f05a 100644 --- a/src/main/java/ch/sbb/tms/platform/springbootstarter/requestreply/service/header/parser/totalreplies/MessageTotalRepliesParser.java +++ b/src/main/java/community/solace/spring/cloud/requestreply/service/header/parser/totalreplies/MessageTotalRepliesParser.java @@ -1,4 +1,4 @@ -package ch.sbb.tms.platform.springbootstarter.requestreply.service.header.parser.totalreplies; +package community.solace.spring.cloud.requestreply.service.header.parser.totalreplies; import org.springframework.lang.Nullable; import org.springframework.messaging.Message; diff --git a/src/main/java/ch/sbb/tms/platform/springbootstarter/requestreply/util/CheckedExceptionWrapper.java b/src/main/java/community/solace/spring/cloud/requestreply/util/CheckedExceptionWrapper.java similarity index 91% rename from src/main/java/ch/sbb/tms/platform/springbootstarter/requestreply/util/CheckedExceptionWrapper.java rename to src/main/java/community/solace/spring/cloud/requestreply/util/CheckedExceptionWrapper.java index 07f8dc4..ed7e410 100644 --- a/src/main/java/ch/sbb/tms/platform/springbootstarter/requestreply/util/CheckedExceptionWrapper.java +++ b/src/main/java/community/solace/spring/cloud/requestreply/util/CheckedExceptionWrapper.java @@ -2,12 +2,12 @@ * Copyright © Schweizerische Bundesbahnen SBB, 2021. */ -package ch.sbb.tms.platform.springbootstarter.requestreply.util; +package community.solace.spring.cloud.requestreply.util; import java.util.function.Function; import java.util.function.Supplier; -import ch.sbb.tms.platform.springbootstarter.requestreply.exception.RequestReplyException; +import community.solace.spring.cloud.requestreply.exception.RequestReplyException; public final class CheckedExceptionWrapper { private CheckedExceptionWrapper() { diff --git a/src/main/java/ch/sbb/tms/platform/springbootstarter/requestreply/util/MessageChunker.java b/src/main/java/community/solace/spring/cloud/requestreply/util/MessageChunker.java similarity index 94% rename from src/main/java/ch/sbb/tms/platform/springbootstarter/requestreply/util/MessageChunker.java rename to src/main/java/community/solace/spring/cloud/requestreply/util/MessageChunker.java index e8a81a9..4d229ee 100644 --- a/src/main/java/ch/sbb/tms/platform/springbootstarter/requestreply/util/MessageChunker.java +++ b/src/main/java/community/solace/spring/cloud/requestreply/util/MessageChunker.java @@ -1,4 +1,4 @@ -package ch.sbb.tms.platform.springbootstarter.requestreply.util; +package community.solace.spring.cloud.requestreply.util; import java.util.ArrayList; import java.util.HashMap; @@ -6,7 +6,7 @@ import java.util.Map; import java.util.stream.Collectors; -import ch.sbb.tms.platform.springbootstarter.requestreply.service.header.parser.SpringHeaderParser; +import community.solace.spring.cloud.requestreply.service.header.parser.SpringHeaderParser; import com.solacesystems.jcsmp.SDTStream; import com.solacesystems.jcsmp.impl.sdt.StreamImpl; import org.apache.commons.lang3.StringUtils; diff --git a/src/main/resources/META-INF/spring.factories b/src/main/resources/META-INF/spring.factories index a5cf99e..411b704 100644 --- a/src/main/resources/META-INF/spring.factories +++ b/src/main/resources/META-INF/spring.factories @@ -1,2 +1,2 @@ -org.springframework.boot.env.EnvironmentPostProcessor=ch.sbb.tms.platform.springbootstarter.requestreply.env.ReplyTopicWithWildcardPropertySourceEnvironmentPostProcessor -org.springframework.context.ApplicationContextInitializer=ch.sbb.tms.platform.springbootstarter.requestreply.service.RequestReplyAutoConfiguration +org.springframework.boot.env.EnvironmentPostProcessor=community.solace.spring.cloud.requestreply.env.ReplyTopicWithWildcardPropertySourceEnvironmentPostProcessor +org.springframework.context.ApplicationContextInitializer=community.solace.spring.cloud.requestreply.service.RequestReplyAutoConfiguration diff --git a/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports index fd791d5..50f8455 100644 --- a/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ b/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -1 +1 @@ -ch.sbb.tms.platform.springbootstarter.requestreply.service.RequestReplyAutoConfiguration \ No newline at end of file +community.solace.spring.cloud.requestreply.service.RequestReplyAutoConfiguration \ No newline at end of file diff --git a/src/test/java/ch/sbb/tms/platform/springbootstarter/requestreply/AbstractRequestReplyIT.java b/src/test/java/community/solace/spring/cloud/requestreply/AbstractRequestReplyIT.java similarity index 84% rename from src/test/java/ch/sbb/tms/platform/springbootstarter/requestreply/AbstractRequestReplyIT.java rename to src/test/java/community/solace/spring/cloud/requestreply/AbstractRequestReplyIT.java index ca83766..ac94c61 100644 --- a/src/test/java/ch/sbb/tms/platform/springbootstarter/requestreply/AbstractRequestReplyIT.java +++ b/src/test/java/community/solace/spring/cloud/requestreply/AbstractRequestReplyIT.java @@ -2,14 +2,14 @@ * Copyright © Schweizerische Bundesbahnen SBB, 2021. */ -package ch.sbb.tms.platform.springbootstarter.requestreply; +package community.solace.spring.cloud.requestreply; import java.sql.Timestamp; import java.util.ArrayList; import java.util.List; -import ch.sbb.tms.platform.sampleapp.springbootstarter.requestreply.RequestReplyTestApplication; -import ch.sbb.tms.platform.sampleapp.springbootstarter.requestreply.integration.RequestReplyTestEndpoint; +import community.solace.spring.cloud.requestreply.sampleapp.RequestReplyTestApplication; +import community.solace.spring.cloud.requestreply.sampleapp.integration.RequestReplyTestEndpoint; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.TestInstance; @@ -26,10 +26,9 @@ import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.TestPropertySource; import org.springframework.test.context.junit.jupiter.SpringExtension; -import org.springframework.test.context.junit4.SpringRunner; -import static ch.sbb.tms.platform.springbootstarter.requestreply.AbstractRequestReplyIT.PROFILE_LOCAL_APP; -import static ch.sbb.tms.platform.springbootstarter.requestreply.AbstractRequestReplyIT.PROFILE_TEST; +import static community.solace.spring.cloud.requestreply.AbstractRequestReplyIT.PROFILE_LOCAL_APP; +import static community.solace.spring.cloud.requestreply.AbstractRequestReplyIT.PROFILE_TEST; import static org.junit.jupiter.api.Assertions.assertFalse; @ActiveProfiles({PROFILE_TEST, PROFILE_LOCAL_APP}) diff --git a/src/test/java/ch/sbb/tms/platform/springbootstarter/requestreply/integration/support/RequestReplyMessageHeaderSupportServiceTest.java b/src/test/java/community/solace/spring/cloud/requestreply/integration/support/RequestReplyMessageHeaderSupportServiceTest.java similarity index 92% rename from src/test/java/ch/sbb/tms/platform/springbootstarter/requestreply/integration/support/RequestReplyMessageHeaderSupportServiceTest.java rename to src/test/java/community/solace/spring/cloud/requestreply/integration/support/RequestReplyMessageHeaderSupportServiceTest.java index 4bdc7e2..f239e13 100644 --- a/src/test/java/ch/sbb/tms/platform/springbootstarter/requestreply/integration/support/RequestReplyMessageHeaderSupportServiceTest.java +++ b/src/test/java/community/solace/spring/cloud/requestreply/integration/support/RequestReplyMessageHeaderSupportServiceTest.java @@ -1,4 +1,4 @@ -package ch.sbb.tms.platform.springbootstarter.requestreply.integration.support; +package community.solace.spring.cloud.requestreply.integration.support; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; @@ -16,8 +16,8 @@ import org.springframework.messaging.Message; import org.springframework.messaging.MessageHeaders; -import ch.sbb.tms.platform.springbootstarter.requestreply.AbstractRequestReplyIT; -import ch.sbb.tms.platform.springbootstarter.requestreply.service.header.RequestReplyMessageHeaderSupportService; +import community.solace.spring.cloud.requestreply.AbstractRequestReplyIT; +import community.solace.spring.cloud.requestreply.service.header.RequestReplyMessageHeaderSupportService; class RequestReplyMessageHeaderSupportServiceTest extends AbstractRequestReplyIT { private static final UnaryOperator DUMMY_FUNCTION = o -> o; diff --git a/src/test/java/ch/sbb/tms/platform/springbootstarter/requestreply/model/SensorReading.java b/src/test/java/community/solace/spring/cloud/requestreply/model/SensorReading.java similarity index 96% rename from src/test/java/ch/sbb/tms/platform/springbootstarter/requestreply/model/SensorReading.java rename to src/test/java/community/solace/spring/cloud/requestreply/model/SensorReading.java index 2a33422..7bd3817 100644 --- a/src/test/java/ch/sbb/tms/platform/springbootstarter/requestreply/model/SensorReading.java +++ b/src/test/java/community/solace/spring/cloud/requestreply/model/SensorReading.java @@ -1,4 +1,4 @@ -package ch.sbb.tms.platform.springbootstarter.requestreply.model; +package community.solace.spring.cloud.requestreply.model; import java.sql.Timestamp; import java.util.Objects; diff --git a/src/test/java/ch/sbb/tms/platform/sampleapp/springbootstarter/requestreply/RequestReplyTestApplication.java b/src/test/java/community/solace/spring/cloud/requestreply/sampleapp/RequestReplyTestApplication.java similarity index 87% rename from src/test/java/ch/sbb/tms/platform/sampleapp/springbootstarter/requestreply/RequestReplyTestApplication.java rename to src/test/java/community/solace/spring/cloud/requestreply/sampleapp/RequestReplyTestApplication.java index 1307932..0eacdd7 100644 --- a/src/test/java/ch/sbb/tms/platform/sampleapp/springbootstarter/requestreply/RequestReplyTestApplication.java +++ b/src/test/java/community/solace/spring/cloud/requestreply/sampleapp/RequestReplyTestApplication.java @@ -2,7 +2,7 @@ * Copyright © Schweizerische Bundesbahnen SBB, 2021. */ -package ch.sbb.tms.platform.sampleapp.springbootstarter.requestreply; +package community.solace.spring.cloud.requestreply.sampleapp; import java.util.concurrent.atomic.AtomicReference; import java.util.function.Consumer; @@ -20,9 +20,9 @@ import org.springframework.messaging.support.GenericMessage; import org.springframework.test.context.ActiveProfiles; -import ch.sbb.tms.platform.springbootstarter.requestreply.AbstractRequestReplyIT; -import ch.sbb.tms.platform.springbootstarter.requestreply.model.SensorReading; -import ch.sbb.tms.platform.springbootstarter.requestreply.service.header.RequestReplyMessageHeaderSupportService; +import community.solace.spring.cloud.requestreply.AbstractRequestReplyIT; +import community.solace.spring.cloud.requestreply.model.SensorReading; +import community.solace.spring.cloud.requestreply.service.header.RequestReplyMessageHeaderSupportService; @ActiveProfiles(AbstractRequestReplyIT.PROFILE_LOCAL_APP) @SpringBootApplication diff --git a/src/test/java/ch/sbb/tms/platform/sampleapp/springbootstarter/requestreply/configuration/RequestReplyTestConfiguration.java b/src/test/java/community/solace/spring/cloud/requestreply/sampleapp/configuration/RequestReplyTestConfiguration.java similarity index 77% rename from src/test/java/ch/sbb/tms/platform/sampleapp/springbootstarter/requestreply/configuration/RequestReplyTestConfiguration.java rename to src/test/java/community/solace/spring/cloud/requestreply/sampleapp/configuration/RequestReplyTestConfiguration.java index 06a965c..68ecb2d 100644 --- a/src/test/java/ch/sbb/tms/platform/sampleapp/springbootstarter/requestreply/configuration/RequestReplyTestConfiguration.java +++ b/src/test/java/community/solace/spring/cloud/requestreply/sampleapp/configuration/RequestReplyTestConfiguration.java @@ -2,9 +2,9 @@ * Copyright © Schweizerische Bundesbahnen SBB, 2021. */ -package ch.sbb.tms.platform.sampleapp.springbootstarter.requestreply.configuration; +package community.solace.spring.cloud.requestreply.sampleapp.configuration; -import ch.sbb.tms.platform.springbootstarter.requestreply.AbstractRequestReplyIT; +import community.solace.spring.cloud.requestreply.AbstractRequestReplyIT; import org.springframework.cloud.stream.binder.test.TestChannelBinderConfiguration; import org.springframework.context.ApplicationContextInitializer; @@ -19,7 +19,7 @@ @Configuration @Import(TestChannelBinderConfiguration.class) @EnableIntegration -@IntegrationComponentScan("ch.sbb.tms.platform.sampleapp.springbootstarter.requestreply.integration") +@IntegrationComponentScan("community.solace.spring.cloud.requestreply.sampleapp.integration") public class RequestReplyTestConfiguration implements ApplicationContextInitializer { @Override diff --git a/src/test/java/ch/sbb/tms/platform/sampleapp/springbootstarter/requestreply/controller/RequestReplyController.java b/src/test/java/community/solace/spring/cloud/requestreply/sampleapp/controller/RequestReplyController.java similarity index 79% rename from src/test/java/ch/sbb/tms/platform/sampleapp/springbootstarter/requestreply/controller/RequestReplyController.java rename to src/test/java/community/solace/spring/cloud/requestreply/sampleapp/controller/RequestReplyController.java index 42f978d..9057dab 100644 --- a/src/test/java/ch/sbb/tms/platform/sampleapp/springbootstarter/requestreply/controller/RequestReplyController.java +++ b/src/test/java/community/solace/spring/cloud/requestreply/sampleapp/controller/RequestReplyController.java @@ -2,13 +2,13 @@ * Copyright © Schweizerische Bundesbahnen SBB, 2021. */ -package ch.sbb.tms.platform.sampleapp.springbootstarter.requestreply.controller; +package community.solace.spring.cloud.requestreply.sampleapp.controller; import java.time.Duration; import java.util.concurrent.TimeoutException; -import ch.sbb.tms.platform.springbootstarter.requestreply.service.RequestReplyService; -import ch.sbb.tms.platform.springbootstarter.requestreply.service.header.parser.errormessage.RemoteErrorException; +import community.solace.spring.cloud.requestreply.service.RequestReplyService; +import community.solace.spring.cloud.requestreply.service.header.parser.errormessage.RemoteErrorException; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.PostMapping; diff --git a/src/test/java/ch/sbb/tms/platform/sampleapp/springbootstarter/requestreply/integration/RequestReplyTestEndpoint.java b/src/test/java/community/solace/spring/cloud/requestreply/sampleapp/integration/RequestReplyTestEndpoint.java similarity index 96% rename from src/test/java/ch/sbb/tms/platform/sampleapp/springbootstarter/requestreply/integration/RequestReplyTestEndpoint.java rename to src/test/java/community/solace/spring/cloud/requestreply/sampleapp/integration/RequestReplyTestEndpoint.java index 0ccc35b..fe34ad8 100644 --- a/src/test/java/ch/sbb/tms/platform/sampleapp/springbootstarter/requestreply/integration/RequestReplyTestEndpoint.java +++ b/src/test/java/community/solace/spring/cloud/requestreply/sampleapp/integration/RequestReplyTestEndpoint.java @@ -2,7 +2,7 @@ * Copyright © Schweizerische Bundesbahnen SBB, 2021. */ -package ch.sbb.tms.platform.sampleapp.springbootstarter.requestreply.integration; +package community.solace.spring.cloud.requestreply.sampleapp.integration; import static org.springframework.test.util.ReflectionTestUtils.invokeMethod; @@ -27,7 +27,7 @@ import org.springframework.stereotype.Component; import org.springframework.util.Assert; -import ch.sbb.tms.platform.springbootstarter.requestreply.service.RequestReplyService; +import community.solace.spring.cloud.requestreply.service.RequestReplyService; @Component @MessageEndpoint diff --git a/src/test/java/ch/sbb/tms/platform/springbootstarter/requestreply/service/HeaderParserTests.java b/src/test/java/community/solace/spring/cloud/requestreply/service/HeaderParserTests.java similarity index 78% rename from src/test/java/ch/sbb/tms/platform/springbootstarter/requestreply/service/HeaderParserTests.java rename to src/test/java/community/solace/spring/cloud/requestreply/service/HeaderParserTests.java index e0f4542..52caf33 100644 --- a/src/test/java/ch/sbb/tms/platform/springbootstarter/requestreply/service/HeaderParserTests.java +++ b/src/test/java/community/solace/spring/cloud/requestreply/service/HeaderParserTests.java @@ -1,14 +1,14 @@ -package ch.sbb.tms.platform.springbootstarter.requestreply.service; +package community.solace.spring.cloud.requestreply.service; import java.util.List; -import ch.sbb.tms.platform.springbootstarter.requestreply.AbstractRequestReplyIT; -import ch.sbb.tms.platform.springbootstarter.requestreply.service.header.RequestReplyMessageHeaderSupportService; -import ch.sbb.tms.platform.springbootstarter.requestreply.service.header.parser.correlationid.MessageCorrelationIdParser; -import ch.sbb.tms.platform.springbootstarter.requestreply.service.header.parser.destination.MessageDestinationParser; -import ch.sbb.tms.platform.springbootstarter.requestreply.service.header.parser.errormessage.MessageErrorMessageParser; -import ch.sbb.tms.platform.springbootstarter.requestreply.service.header.parser.replyto.MessageReplyToParser; -import ch.sbb.tms.platform.springbootstarter.requestreply.service.header.parser.totalreplies.MessageTotalRepliesParser; +import community.solace.spring.cloud.requestreply.AbstractRequestReplyIT; +import community.solace.spring.cloud.requestreply.service.header.RequestReplyMessageHeaderSupportService; +import community.solace.spring.cloud.requestreply.service.header.parser.correlationid.MessageCorrelationIdParser; +import community.solace.spring.cloud.requestreply.service.header.parser.destination.MessageDestinationParser; +import community.solace.spring.cloud.requestreply.service.header.parser.errormessage.MessageErrorMessageParser; +import community.solace.spring.cloud.requestreply.service.header.parser.replyto.MessageReplyToParser; +import community.solace.spring.cloud.requestreply.service.header.parser.totalreplies.MessageTotalRepliesParser; import com.solace.spring.cloud.stream.binder.messaging.SolaceHeaders; import org.junit.jupiter.api.Test; @@ -17,7 +17,7 @@ import org.springframework.integration.support.MessageBuilder; import org.springframework.messaging.Message; -import static ch.sbb.tms.platform.springbootstarter.requestreply.service.header.parser.HttpHeaderParser.HTTP_HEADER_CORRELATION_ID; +import static community.solace.spring.cloud.requestreply.service.header.parser.HttpHeaderParser.HTTP_HEADER_CORRELATION_ID; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNull; diff --git a/src/test/java/ch/sbb/tms/platform/springbootstarter/requestreply/service/RequestReplyServiceTests.java b/src/test/java/community/solace/spring/cloud/requestreply/service/RequestReplyServiceTests.java similarity index 98% rename from src/test/java/ch/sbb/tms/platform/springbootstarter/requestreply/service/RequestReplyServiceTests.java rename to src/test/java/community/solace/spring/cloud/requestreply/service/RequestReplyServiceTests.java index 85e87e1..af72d12 100644 --- a/src/test/java/ch/sbb/tms/platform/springbootstarter/requestreply/service/RequestReplyServiceTests.java +++ b/src/test/java/community/solace/spring/cloud/requestreply/service/RequestReplyServiceTests.java @@ -1,13 +1,12 @@ -package ch.sbb.tms.platform.springbootstarter.requestreply.service; +package community.solace.spring.cloud.requestreply.service; -import java.sql.Timestamp; import java.time.Duration; import java.util.concurrent.TimeoutException; import java.util.concurrent.atomic.AtomicReference; -import ch.sbb.tms.platform.springbootstarter.requestreply.AbstractRequestReplyIT; -import ch.sbb.tms.platform.springbootstarter.requestreply.model.SensorReading; -import ch.sbb.tms.platform.springbootstarter.requestreply.service.header.parser.errormessage.RemoteErrorException; +import community.solace.spring.cloud.requestreply.AbstractRequestReplyIT; +import community.solace.spring.cloud.requestreply.model.SensorReading; +import community.solace.spring.cloud.requestreply.service.header.parser.errormessage.RemoteErrorException; import org.junit.jupiter.api.Test; import org.mockito.ArgumentCaptor; import org.mockito.Captor; @@ -23,7 +22,7 @@ import org.springframework.messaging.support.MessageBuilder; import org.springframework.messaging.support.MessageHeaderAccessor; -import static ch.sbb.tms.platform.springbootstarter.requestreply.model.SensorReading.BaseUnit.CELSIUS; +import static community.solace.spring.cloud.requestreply.model.SensorReading.BaseUnit.CELSIUS; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertThrows; diff --git a/src/test/java/ch/sbb/tms/platform/springbootstarter/requestreply/service/header/RequestReplyMessageHeaderSupportServiceTests.java b/src/test/java/community/solace/spring/cloud/requestreply/service/header/RequestReplyMessageHeaderSupportServiceTests.java similarity index 98% rename from src/test/java/ch/sbb/tms/platform/springbootstarter/requestreply/service/header/RequestReplyMessageHeaderSupportServiceTests.java rename to src/test/java/community/solace/spring/cloud/requestreply/service/header/RequestReplyMessageHeaderSupportServiceTests.java index 32aa989..76caf07 100644 --- a/src/test/java/ch/sbb/tms/platform/springbootstarter/requestreply/service/header/RequestReplyMessageHeaderSupportServiceTests.java +++ b/src/test/java/community/solace/spring/cloud/requestreply/service/header/RequestReplyMessageHeaderSupportServiceTests.java @@ -1,4 +1,4 @@ -package ch.sbb.tms.platform.springbootstarter.requestreply.service.header; +package community.solace.spring.cloud.requestreply.service.header; import java.nio.charset.StandardCharsets; import java.time.Duration; @@ -6,8 +6,8 @@ import java.util.List; import java.util.function.Function; -import ch.sbb.tms.platform.springbootstarter.requestreply.AbstractRequestReplyIT; -import ch.sbb.tms.platform.springbootstarter.requestreply.service.header.parser.SpringHeaderParser; +import community.solace.spring.cloud.requestreply.AbstractRequestReplyIT; +import community.solace.spring.cloud.requestreply.service.header.parser.SpringHeaderParser; import com.solacesystems.jcsmp.SDTStream; import com.solacesystems.jcsmp.impl.sdt.StreamImpl; import org.junit.jupiter.api.Test; diff --git a/src/test/java/ch/sbb/tms/platform/springbootstarter/requestreply/service/header/parser/BinderHeaderParserTests.java b/src/test/java/community/solace/spring/cloud/requestreply/service/header/parser/BinderHeaderParserTests.java similarity index 89% rename from src/test/java/ch/sbb/tms/platform/springbootstarter/requestreply/service/header/parser/BinderHeaderParserTests.java rename to src/test/java/community/solace/spring/cloud/requestreply/service/header/parser/BinderHeaderParserTests.java index 9562750..42853ae 100644 --- a/src/test/java/ch/sbb/tms/platform/springbootstarter/requestreply/service/header/parser/BinderHeaderParserTests.java +++ b/src/test/java/community/solace/spring/cloud/requestreply/service/header/parser/BinderHeaderParserTests.java @@ -1,4 +1,4 @@ -package ch.sbb.tms.platform.springbootstarter.requestreply.service.header.parser; +package community.solace.spring.cloud.requestreply.service.header.parser; import org.junit.jupiter.api.Test; diff --git a/src/test/java/ch/sbb/tms/platform/springbootstarter/requestreply/service/header/parser/SpringCloudStreamHeaderParserTests.java b/src/test/java/community/solace/spring/cloud/requestreply/service/header/parser/SpringCloudStreamHeaderParserTests.java similarity index 88% rename from src/test/java/ch/sbb/tms/platform/springbootstarter/requestreply/service/header/parser/SpringCloudStreamHeaderParserTests.java rename to src/test/java/community/solace/spring/cloud/requestreply/service/header/parser/SpringCloudStreamHeaderParserTests.java index e058bf6..1befbfd 100644 --- a/src/test/java/ch/sbb/tms/platform/springbootstarter/requestreply/service/header/parser/SpringCloudStreamHeaderParserTests.java +++ b/src/test/java/community/solace/spring/cloud/requestreply/service/header/parser/SpringCloudStreamHeaderParserTests.java @@ -1,4 +1,4 @@ -package ch.sbb.tms.platform.springbootstarter.requestreply.service.header.parser; +package community.solace.spring.cloud.requestreply.service.header.parser; import org.junit.jupiter.api.Test; diff --git a/src/test/java/ch/sbb/tms/platform/springbootstarter/requestreply/util/CheckedExceptionWrapperTest.java b/src/test/java/community/solace/spring/cloud/requestreply/util/CheckedExceptionWrapperTest.java similarity index 93% rename from src/test/java/ch/sbb/tms/platform/springbootstarter/requestreply/util/CheckedExceptionWrapperTest.java rename to src/test/java/community/solace/spring/cloud/requestreply/util/CheckedExceptionWrapperTest.java index e4374f1..cdb0fbe 100644 --- a/src/test/java/ch/sbb/tms/platform/springbootstarter/requestreply/util/CheckedExceptionWrapperTest.java +++ b/src/test/java/community/solace/spring/cloud/requestreply/util/CheckedExceptionWrapperTest.java @@ -2,7 +2,7 @@ * Copyright © Schweizerische Bundesbahnen SBB, 2021. */ -package ch.sbb.tms.platform.springbootstarter.requestreply.util; +package community.solace.spring.cloud.requestreply.util; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.fail; @@ -14,7 +14,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import ch.sbb.tms.platform.springbootstarter.requestreply.exception.RequestReplyException; +import community.solace.spring.cloud.requestreply.exception.RequestReplyException; class CheckedExceptionWrapperTest { private static final Logger LOG = LoggerFactory.getLogger(CheckedExceptionWrapperTest.class); diff --git a/src/test/resources/application-localApp.yaml b/src/test/resources/application-localApp.yaml index 9473e03..f2ea69c 100644 --- a/src/test/resources/application-localApp.yaml +++ b/src/test/resources/application-localApp.yaml @@ -66,7 +66,7 @@ spring: logging: level: - ch.sbb.tms.platform.springbootstarter.requestreply: DEBUG + community.solace.spring.cloud.requestreply: DEBUG org.springframework.cloud.function: DEBUG org.springframework.cloud.stream.function: DEBUG com.solace.spring.cloud.stream.binder: DEBUG diff --git a/src/test/resources/application-test.yaml b/src/test/resources/application-test.yaml index a93f3cf..906aee3 100644 --- a/src/test/resources/application-test.yaml +++ b/src/test/resources/application-test.yaml @@ -1,4 +1,4 @@ -context.initializer.classes: ch.sbb.tms.platform.sampleapp.springbootstarter.requestreply.configuration.RequestReplyTestConfiguration +context.initializer.classes: community.solace.spring.cloud.requestreply.sampleapp.configuration.RequestReplyTestConfiguration spring: cloud: