S28 3702: PMD Fix #1032

lucas-phillips28 · 2025-03-28T10:46:31Z

JIRA ticket(s)

S28-3702

Change description

# Conflicts: # src/integrationTest/java/uk/gov/hmcts/reform/preapi/services/ReportServiceIT.java # src/main/java/uk/gov/hmcts/reform/preapi/media/MediaKind.java

hmcts-jenkins-cnp · 2025-05-12T11:27:21Z

Plan Result (stg)

⚠️ Resource Deletion will happen

This plan contains resource delete operation. Please check the plan result very carefully!

Plan: 0 to add, 5 to change, 1 to destroy.

Update
- module.apim_subscription_editvm[0].azurerm_api_management_subscription.subscription
- module.apim_subscription_portal[0].azurerm_api_management_subscription.subscription
- module.apim_subscription_powerplatform[0].azurerm_api_management_subscription.subscription
- module.apim_subscription_smoketest[0].azurerm_api_management_subscription.subscription
- module.pre-api-exception-alert[0].azurerm_resource_group_template_deployment.custom_alert[0]
Delete
- azurerm_api_management_api_diagnostic.api_mgmt_logs

Change Result (Click me)

  # azurerm_api_management_api_diagnostic.api_mgmt_logs will be destroyed
  # (because azurerm_api_management_api_diagnostic.api_mgmt_logs is not in configuration)
  - resource "azurerm_api_management_api_diagnostic" "api_mgmt_logs" {
      - always_log_errors         = true -> null
      - api_management_logger_id  = "/subscriptions/74dacd4f-a248-45bb-a2f0-af700dc4cf68/resourceGroups/ss-stg-network-rg/providers/Microsoft.ApiManagement/service/sds-api-mgmt-stg/loggers/sds-api-mgmt-stg-logger" -> null
      - api_management_name       = "sds-api-mgmt-stg" -> null
      - api_name                  = "pre-api" -> null
      - http_correlation_protocol = "W3C" -> null
      - id                        = "/subscriptions/74dacd4f-a248-45bb-a2f0-af700dc4cf68/resourceGroups/ss-stg-network-rg/providers/Microsoft.ApiManagement/service/sds-api-mgmt-stg/apis/pre-api/diagnostics/applicationinsights" -> null
      - identifier                = "applicationinsights" -> null
      - log_client_ip             = true -> null
      - operation_name_format     = "Name" -> null
      - resource_group_name       = "ss-stg-network-rg" -> null
      - sampling_percentage       = 100 -> null
      - verbosity                 = "verbose" -> null

      - backend_request {
          - body_bytes     = 8192 -> null
          - headers_to_log = [
              - "X-User-Id",
              - "accept",
              - "content-type",
              - "origin",
            ] -> null
        }

      - backend_response {
          - body_bytes     = 8192 -> null
          - headers_to_log = [
              - "accept",
              - "content-type",
              - "origin",
            ] -> null
        }

      - frontend_request {
          - body_bytes     = 8192 -> null
          - headers_to_log = [
              - "X-User-Id",
              - "accept",
              - "content-type",
              - "origin",
            ] -> null
        }

      - frontend_response {
          - body_bytes     = 8192 -> null
          - headers_to_log = [
              - "accept",
              - "content-type",
              - "origin",
            ] -> null
        }
    }

  # module.apim_subscription_editvm[0].azurerm_api_management_subscription.subscription will be updated in-place
  ~ resource "azurerm_api_management_subscription" "subscription" {
      ~ allow_tracing       = false -> true
        id                  = "/subscriptions/74dacd4f-a248-45bb-a2f0-af700dc4cf68/resourceGroups/ss-stg-network-rg/providers/Microsoft.ApiManagement/service/sds-api-mgmt-stg/subscriptions/8265f455-2bf2-4c4b-8ba3-bfd0a2f5a6b7"
        # (10 unchanged attributes hidden)
    }

  # module.apim_subscription_portal[0].azurerm_api_management_subscription.subscription will be updated in-place
  ~ resource "azurerm_api_management_subscription" "subscription" {
      ~ allow_tracing       = false -> true
        id                  = "/subscriptions/74dacd4f-a248-45bb-a2f0-af700dc4cf68/resourceGroups/ss-stg-network-rg/providers/Microsoft.ApiManagement/service/sds-api-mgmt-stg/subscriptions/500e642d-76ef-4d82-8741-bf9e9d979705"
        # (10 unchanged attributes hidden)
    }

  # module.apim_subscription_powerplatform[0].azurerm_api_management_subscription.subscription will be updated in-place
  ~ resource "azurerm_api_management_subscription" "subscription" {
      ~ allow_tracing       = false -> true
        id                  = "/subscriptions/74dacd4f-a248-45bb-a2f0-af700dc4cf68/resourceGroups/ss-stg-network-rg/providers/Microsoft.ApiManagement/service/sds-api-mgmt-stg/subscriptions/37f73c17-345b-4c67-81d5-50d582e97227"
        # (10 unchanged attributes hidden)
    }

  # module.apim_subscription_smoketest[0].azurerm_api_management_subscription.subscription will be updated in-place
  ~ resource "azurerm_api_management_subscription" "subscription" {
      ~ allow_tracing       = false -> true
        id                  = "/subscriptions/74dacd4f-a248-45bb-a2f0-af700dc4cf68/resourceGroups/ss-stg-network-rg/providers/Microsoft.ApiManagement/service/sds-api-mgmt-stg/subscriptions/da1d82f9-7187-4cb6-a6dd-b0020311f3bb"
        # (10 unchanged attributes hidden)
    }

  # module.pre-api-exception-alert[0].azurerm_resource_group_template_deployment.custom_alert[0] will be updated in-place
  ~ resource "azurerm_resource_group_template_deployment" "custom_alert" {
        id                       = "/subscriptions/74dacd4f-a248-45bb-a2f0-af700dc4cf68/resourceGroups/pre-stg/providers/Microsoft.Resources/deployments/PRE_API_exception"
        name                     = "PRE_API_exception"
        tags                     = {}
      ~ template_content         = jsonencode(
          ~ {
              ~ parameters     = {
                  ~ actionGroupName          = {
                      ~ type = "String" -> "string"
                    }
                  ~ actionGroupRg            = {
                      ~ type = "String" -> "string"
                    }
                  ~ alertDesc                = {
                      ~ type = "String" -> "string"
                    }
                  ~ alertName                = {
                      ~ type = "String" -> "string"
                    }
                  ~ appInsightsName          = {
                      ~ type = "String" -> "string"
                    }
                  ~ appInsightsQuery         = {
                      ~ type = "String" -> "string"
                    }
                  ~ commonTags               = {
                      ~ type = "String" -> "string"
                    }
                  ~ customEmailSubject       = {
                      ~ type = "String" -> "string"
                    }
                  ~ frequencyInMinutes       = {
                      ~ type         = "String" -> "string"
                        # (1 unchanged attribute hidden)
                    }
                  ~ location                 = {
                      ~ type = "String" -> "string"
                    }
                  ~ severityLevel            = {
                      ~ type         = "String" -> "string"
                        # (1 unchanged attribute hidden)
                    }
                  ~ timeWindowInMinutes      = {
                      ~ type         = "String" -> "string"
                        # (1 unchanged attribute hidden)
                    }
                  ~ triggerThreshold         = {
                      ~ type = "String" -> "string"
                    }
                  ~ triggerThresholdOperator = {
                      ~ type          = "String" -> "string"
                        # (2 unchanged attributes hidden)
                    }
                }
                # (4 unchanged attributes hidden)
            }
        )
        # (6 unchanged attributes hidden)
    }

Plan: 0 to add, 5 to change, 1 to destroy.

hmcts-jenkins-cnp · 2025-05-12T11:27:55Z

Plan Result (prod)

⚠️ Resource Deletion will happen

This plan contains resource delete operation. Please check the plan result very carefully!

Plan: 0 to add, 2 to change, 1 to destroy.

Update
- module.pre-api-exception-alert[0].azurerm_resource_group_template_deployment.custom_alert[0]
- module.pre-api-liveness-alert[0].azurerm_resource_group_template_deployment.custom_alert[0]
Delete
- azurerm_api_management_api_diagnostic.api_mgmt_logs

Change Result (Click me)

  # azurerm_api_management_api_diagnostic.api_mgmt_logs will be destroyed
  # (because azurerm_api_management_api_diagnostic.api_mgmt_logs is not in configuration)
  - resource "azurerm_api_management_api_diagnostic" "api_mgmt_logs" {
      - always_log_errors         = true -> null
      - api_management_logger_id  = "/subscriptions/5ca62022-6aa2-4cee-aaa7-e7536c8d566c/resourceGroups/ss-prod-network-rg/providers/Microsoft.ApiManagement/service/sds-api-mgmt-prod/loggers/sds-api-mgmt-prod-logger" -> null
      - api_management_name       = "sds-api-mgmt-prod" -> null
      - api_name                  = "pre-api" -> null
      - http_correlation_protocol = "W3C" -> null
      - id                        = "/subscriptions/5ca62022-6aa2-4cee-aaa7-e7536c8d566c/resourceGroups/ss-prod-network-rg/providers/Microsoft.ApiManagement/service/sds-api-mgmt-prod/apis/pre-api/diagnostics/applicationinsights" -> null
      - identifier                = "applicationinsights" -> null
      - log_client_ip             = true -> null
      - operation_name_format     = "Name" -> null
      - resource_group_name       = "ss-prod-network-rg" -> null
      - sampling_percentage       = 100 -> null
      - verbosity                 = "verbose" -> null

      - backend_request {
          - body_bytes     = 8192 -> null
          - headers_to_log = [
              - "X-User-Id",
              - "accept",
              - "content-type",
              - "origin",
            ] -> null
        }

      - backend_response {
          - body_bytes     = 8192 -> null
          - headers_to_log = [
              - "accept",
              - "content-type",
              - "origin",
            ] -> null
        }

      - frontend_request {
          - body_bytes     = 8192 -> null
          - headers_to_log = [
              - "X-User-Id",
              - "accept",
              - "content-type",
              - "origin",
            ] -> null
        }

      - frontend_response {
          - body_bytes     = 8192 -> null
          - headers_to_log = [
              - "accept",
              - "content-type",
              - "origin",
            ] -> null
        }
    }

  # module.pre-api-exception-alert[0].azurerm_resource_group_template_deployment.custom_alert[0] will be updated in-place
  ~ resource "azurerm_resource_group_template_deployment" "custom_alert" {
        id                       = "/subscriptions/5ca62022-6aa2-4cee-aaa7-e7536c8d566c/resourceGroups/pre-prod/providers/Microsoft.Resources/deployments/PRE_API_exception"
        name                     = "PRE_API_exception"
        tags                     = {}
      ~ template_content         = jsonencode(
          ~ {
              ~ parameters     = {
                  ~ actionGroupName          = {
                      ~ type = "String" -> "string"
                    }
                  ~ actionGroupRg            = {
                      ~ type = "String" -> "string"
                    }
                  ~ alertDesc                = {
                      ~ type = "String" -> "string"
                    }
                  ~ alertName                = {
                      ~ type = "String" -> "string"
                    }
                  ~ appInsightsName          = {
                      ~ type = "String" -> "string"
                    }
                  ~ appInsightsQuery         = {
                      ~ type = "String" -> "string"
                    }
                  ~ commonTags               = {
                      ~ type = "String" -> "string"
                    }
                  ~ customEmailSubject       = {
                      ~ type = "String" -> "string"
                    }
                  ~ frequencyInMinutes       = {
                      ~ type         = "String" -> "string"
                        # (1 unchanged attribute hidden)
                    }
                  ~ location                 = {
                      ~ type = "String" -> "string"
                    }
                  ~ severityLevel            = {
                      ~ type         = "String" -> "string"
                        # (1 unchanged attribute hidden)
                    }
                  ~ timeWindowInMinutes      = {
                      ~ type         = "String" -> "string"
                        # (1 unchanged attribute hidden)
                    }
                  ~ triggerThreshold         = {
                      ~ type = "String" -> "string"
                    }
                  ~ triggerThresholdOperator = {
                      ~ type          = "String" -> "string"
                        # (2 unchanged attributes hidden)
                    }
                }
                # (4 unchanged attributes hidden)
            }
        )
        # (6 unchanged attributes hidden)
    }

  # module.pre-api-liveness-alert[0].azurerm_resource_group_template_deployment.custom_alert[0] will be updated in-place
  ~ resource "azurerm_resource_group_template_deployment" "custom_alert" {
        id                       = "/subscriptions/5ca62022-6aa2-4cee-aaa7-e7536c8d566c/resourceGroups/pre-prod/providers/Microsoft.Resources/deployments/PRE_API_liveness"
        name                     = "PRE_API_liveness"
        tags                     = {}
      ~ template_content         = jsonencode(
          ~ {
              ~ parameters     = {
                  ~ actionGroupName          = {
                      ~ type = "String" -> "string"
                    }
                  ~ actionGroupRg            = {
                      ~ type = "String" -> "string"
                    }
                  ~ alertDesc                = {
                      ~ type = "String" -> "string"
                    }
                  ~ alertName                = {
                      ~ type = "String" -> "string"
                    }
                  ~ appInsightsName          = {
                      ~ type = "String" -> "string"
                    }
                  ~ appInsightsQuery         = {
                      ~ type = "String" -> "string"
                    }
                  ~ commonTags               = {
                      ~ type = "String" -> "string"
                    }
                  ~ customEmailSubject       = {
                      ~ type = "String" -> "string"
                    }
                  ~ frequencyInMinutes       = {
                      ~ type         = "String" -> "string"
                        # (1 unchanged attribute hidden)
                    }
                  ~ location                 = {
                      ~ type = "String" -> "string"
                    }
                  ~ severityLevel            = {
                      ~ type         = "String" -> "string"
                        # (1 unchanged attribute hidden)
                    }
                  ~ timeWindowInMinutes      = {
                      ~ type         = "String" -> "string"
                        # (1 unchanged attribute hidden)
                    }
                  ~ triggerThreshold         = {
                      ~ type = "String" -> "string"
                    }
                  ~ triggerThresholdOperator = {
                      ~ type          = "String" -> "string"
                        # (2 unchanged attributes hidden)
                    }
                }
                # (4 unchanged attributes hidden)
            }
        )
        # (6 unchanged attributes hidden)
    }

Plan: 0 to add, 2 to change, 1 to destroy.

# Conflicts: # src/integrationTest/java/uk/gov/hmcts/reform/preapi/tasks/AddNROUsersIT.java # src/main/java/uk/gov/hmcts/reform/preapi/controllers/MediaServiceController.java # src/main/java/uk/gov/hmcts/reform/preapi/entities/Permission.java # src/main/java/uk/gov/hmcts/reform/preapi/entities/Role.java # src/main/java/uk/gov/hmcts/reform/preapi/media/MediaKind.java # src/main/java/uk/gov/hmcts/reform/preapi/media/storage/AzureStorageService.java # src/main/java/uk/gov/hmcts/reform/preapi/services/CaptureSessionService.java # src/main/java/uk/gov/hmcts/reform/preapi/tasks/CheckForMissingRecordings.java # src/main/java/uk/gov/hmcts/reform/preapi/tasks/CleanupLiveEvents.java # src/main/java/uk/gov/hmcts/reform/preapi/tasks/StartLiveEvents.java

…ce logging

# Conflicts: # src/functionalTest/java/uk/gov/hmcts/reform/preapi/controllers/ReportControllerFT.java # src/integrationTest/java/uk/gov/hmcts/reform/preapi/services/RoomServiceIT.java # src/integrationTest/java/uk/gov/hmcts/reform/preapi/tasks/AddNROUsersIT.java # src/main/java/uk/gov/hmcts/reform/preapi/component/CommandExecutor.java # src/main/java/uk/gov/hmcts/reform/preapi/component/util/CommandRunner.java # src/main/java/uk/gov/hmcts/reform/preapi/config/SecurityConfig.java # src/main/java/uk/gov/hmcts/reform/preapi/controllers/MediaServiceController.java # src/main/java/uk/gov/hmcts/reform/preapi/controllers/TestingSupportController.java # src/main/java/uk/gov/hmcts/reform/preapi/email/CaseStateChangeNotifierFlowClient.java # src/main/java/uk/gov/hmcts/reform/preapi/email/StopLiveEventNotifierFlowClient.java # src/main/java/uk/gov/hmcts/reform/preapi/exception/AMSLiveEventNotFoundException.java # src/main/java/uk/gov/hmcts/reform/preapi/exception/RecordingNotDeletedException.java # src/main/java/uk/gov/hmcts/reform/preapi/media/MediaKind.java # src/main/java/uk/gov/hmcts/reform/preapi/media/edit/FfmpegService.java # src/main/java/uk/gov/hmcts/reform/preapi/media/storage/AzureFinalStorageService.java # src/main/java/uk/gov/hmcts/reform/preapi/media/storage/AzureStorageService.java # src/main/java/uk/gov/hmcts/reform/preapi/repositories/ShareBookingRepository.java # src/main/java/uk/gov/hmcts/reform/preapi/security/AuthorisationService.java # src/main/java/uk/gov/hmcts/reform/preapi/security/filter/XUserIdFilter.java # src/main/java/uk/gov/hmcts/reform/preapi/services/CaseService.java # src/main/java/uk/gov/hmcts/reform/preapi/services/CourtService.java # src/main/java/uk/gov/hmcts/reform/preapi/services/EditRequestService.java # src/main/java/uk/gov/hmcts/reform/preapi/services/RecordingService.java # src/main/java/uk/gov/hmcts/reform/preapi/services/ReportService.java # src/main/java/uk/gov/hmcts/reform/preapi/tasks/AddNROUsers.java # src/main/java/uk/gov/hmcts/reform/preapi/tasks/CleanupLiveEvents.java # src/test/java/uk/gov/hmcts/reform/preapi/services/BookingServiceTest.java

# Conflicts: # src/main/java/uk/gov/hmcts/reform/preapi/batch/application/services/extraction/DataExtractionService.java # src/main/java/uk/gov/hmcts/reform/preapi/batch/application/services/validation/DataValidationService.java # src/main/java/uk/gov/hmcts/reform/preapi/batch/config/jobs/PostMigrationJobConfig.java # src/main/java/uk/gov/hmcts/reform/preapi/batch/config/steps/CoreStepsConfig.java # src/main/java/uk/gov/hmcts/reform/preapi/batch/entities/ExtractedMetadata.java # src/main/java/uk/gov/hmcts/reform/preapi/dto/EditCutInstructionDTO.java # src/main/java/uk/gov/hmcts/reform/preapi/media/MediaKind.java # src/main/java/uk/gov/hmcts/reform/preapi/media/edit/FfmpegService.java # src/main/java/uk/gov/hmcts/reform/preapi/media/storage/AzureStorageService.java # src/main/java/uk/gov/hmcts/reform/preapi/services/EditRequestService.java # src/main/java/uk/gov/hmcts/reform/preapi/tasks/CleanupLiveEvents.java # src/main/java/uk/gov/hmcts/reform/preapi/tasks/ProcessCaptureSessions.java # src/test/java/uk/gov/hmcts/reform/preapi/batch/application/processor/ProcessorTest.java # src/test/java/uk/gov/hmcts/reform/preapi/batch/config/steps/CoreStepsConfigTest.java

lucas-phillips28 added 9 commits March 28, 2025 10:44

Update ruleset

ee25d8a

Fix issues

872ae51

Fix tests

7758605

fix pmd main

dd17698

fix test

397f65b

fix tests

1873422

fix tasks

7a1eb5b

fix: refactor switch statements + suppress PMD warnings

bb08e81

Merge branch 'master' into S28-3702/pmd-fix

95744a8

# Conflicts: # src/integrationTest/java/uk/gov/hmcts/reform/preapi/services/ReportServiceIT.java # src/main/java/uk/gov/hmcts/reform/preapi/media/MediaKind.java

hmcts-jenkins-cnp bot added the stg/destroy label May 12, 2025

hmcts-jenkins-cnp bot added the prod/destroy label May 12, 2025

hmcts-jenkins-cnp bot deployed to preview May 12, 2025 11:27 View deployment

hmcts-jenkins-cnp bot added ns:pre prd:pre rel:pre-api-pr-1032 labels May 12, 2025

lucas-phillips28 added 2 commits May 12, 2025 12:35

fix: add constructors to exceptions for exception cause

a33b0a6

fix: pmd issues for editing

c381d34

hmcts-jenkins-cnp bot deployed to preview May 12, 2025 11:42 View deployment

lucas-phillips28 marked this pull request as ready for review May 13, 2025 10:40

lucas-phillips28 requested a review from a team as a code owner May 13, 2025 10:40

jasonpaige previously approved these changes May 13, 2025

View reviewed changes

lucas-phillips28 added 2 commits June 13, 2025 11:13

refactor(pmd): improve type safety, add serial annotations, and enhan…

72a4fe9

…ce logging

lucas-phillips28 dismissed jasonpaige’s stale review via 72a4fe9 June 16, 2025 09:58

fix(tests): replace FileInputStream with InputStream in tests

a55fd5e

hmcts-jenkins-cnp bot deployed to preview June 16, 2025 10:38 View deployment

lucas-phillips28 added 2 commits August 21, 2025 12:41

fix: pmd issues

d3a39c8

fix: apply code cleanup and minor refactoring in tests and entities

3b456bb

hmcts-jenkins-cnp bot deployed to preview August 22, 2025 10:03 View deployment

lucas-phillips28 added 4 commits August 26, 2025 09:11

fix: pmd issues

e3f3a4d

fix: pmd issues

f4f7268

fix: tests

4a1acc1

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Uh oh!

S28 3702: PMD Fix #1032

S28 3702: PMD Fix #1032

Uh oh!

lucas-phillips28 commented Mar 28, 2025

Uh oh!

hmcts-jenkins-cnp bot commented May 12, 2025

Uh oh!

hmcts-jenkins-cnp bot commented May 12, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

Uh oh!

S28 3702: PMD Fix #1032

Are you sure you want to change the base?

S28 3702: PMD Fix #1032

Uh oh!

Conversation

lucas-phillips28 commented Mar 28, 2025

JIRA ticket(s)

Change description

Uh oh!

hmcts-jenkins-cnp bot commented May 12, 2025

Plan Result (stg)

⚠️ Resource Deletion will happen

Uh oh!

hmcts-jenkins-cnp bot commented May 12, 2025

Plan Result (prod)

⚠️ Resource Deletion will happen

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants