Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

SDT-231: Rework integration with service bus #620

Merged
merged 4 commits into from
Sep 5, 2024
Merged

Conversation

paulridout
Copy link
Collaborator

JIRA link (if applicable)

SDT-231 (https://tools.hmcts.net/jira/browse/SDT-231)

Change description

  • Removed feature flags from application.yaml
  • Added service bus properties to integration test application YAML files.
  • Added connection factory configuration class for creating a connection factory for the service bus.
  • Added a test connection factory configuration class for creating a connection factory for ActiveMQ which is used by the integration tests.
  • Updated integration tests to include test connection factory configuration class.
  • Removed feature flag from JmsTemplateConfig class.
  • Removed feature flag and associated queue reset code from MessageWriter class.
  • Removed feature flag and associated single executor code from MessagingUtility class.
  • Added RequeueIndividualRequestUtility class.
  • Amended SdtManagementMBean class to use RequeueIndividualRequestUtility class instead of MessagingUtility class. Also removed redundant code and refactored logging statements.
  • Updated SdtManagementMBeanTest class to reflect changes to SdtManagementMBean. Removed redundant code.

Does this PR introduce a breaking change? (check one with "x")

[ ] Yes
[x] No

- Removed feature flags from application.yaml
- Added service bus properties to integration test application YAML files.
- Added connection factory configuration class for creating a connection factory for the service bus.
- Added a test connection factory configuration class for creating a connection factory for ActiveMQ which is used by the integration tests.
- Updated integration tests to include test connection factory configuration class.
- Removed feature flag from JmsTemplateConfig class.
- Removed feature flag and associated queue reset code from MessageWriter class.
- Removed feature flag and associated single executor code from MessagingUtility class.
- Added RequeueIndividualRequestUtility class.
- Amended SdtManagementMBean class to use RequeueIndividualRequestUtility class instead of MessagingUtility class.  Also removed redundant code and refactored logging statements.
- Updated SdtManagementMBeanTest class to reflect changes to SdtManagementMBean.  Removed redundant code.
- Removed extra debug logging that was added to MessagingUtility and MessageWriter.
@hmcts-jenkins-a-to-c hmcts-jenkins-a-to-c bot deployed to preview August 21, 2024 10:45 Active
ssivas6
ssivas6 previously approved these changes Aug 21, 2024
Copy link
Contributor

@ssivas6 ssivas6 left a comment

Choose a reason for hiding this comment

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

Changes look good

RebeccaBaker
RebeccaBaker previously approved these changes Aug 21, 2024
Added enable-new-queue-process feature flag to allow switching between the different methods of integration with service bus.

The changes make the queue reset code in MessageWriter that was behind the enable-queue-reset flag the normal path.  This allows a single feature flag to control the service bus integration method used.
@hmcts-jenkins-a-to-c
Copy link
Contributor

Plan Result (aat)

No changes. Your infrastructure matches the configuration.

@hmcts-jenkins-a-to-c
Copy link
Contributor

Plan Result (prod)

No changes. Your infrastructure matches the configuration.

@hmcts-jenkins-a-to-c hmcts-jenkins-a-to-c bot deployed to preview August 27, 2024 08:57 Active
@hmcts-jenkins-a-to-c hmcts-jenkins-a-to-c bot deployed to preview August 27, 2024 17:04 Active
@hmcts-jenkins-a-to-c hmcts-jenkins-a-to-c bot deployed to preview August 28, 2024 09:13 Active
Copy link
Contributor

@ssivas6 ssivas6 left a comment

Choose a reason for hiding this comment

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

Changes look good

@hmcts-jenkins-a-to-c hmcts-jenkins-a-to-c bot deployed to preview August 30, 2024 15:54 Active
@hemantt
Copy link
Collaborator

hemantt commented Sep 4, 2024

Reviewed and tested with @paulridout locally

@RebeccaBaker RebeccaBaker merged commit 6adf3ad into master Sep 5, 2024
2 checks passed
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.

4 participants