DTSCCI-3856 High severity constant naming cleanup in DJ enums

src/main/java/uk/gov/hmcts/reform/civil/enums/dj/CaseManagementOrderAdditional.java

@@ -1,11 +1,26 @@
 package uk.gov.hmcts.reform.civil.enums.dj;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
+
 public enum CaseManagementOrderAdditional {
-    OrderTypeTrialAdditionalDirectionsBuildingDispute,
-    OrderTypeTrialAdditionalDirectionsClinicalNegligence,
-    OrderTypeTrialAdditionalDirectionsCreditHire,
-    OrderTypeTrialAdditionalDirectionsEmployersLiability,
-    OrderTypeTrialAdditionalDirectionsHousingDisrepair,
-    OrderTypeTrialAdditionalDirectionsPersonalInjury,
-    OrderTypeTrialAdditionalDirectionsRoadTrafficAccident
+    @JsonProperty("OrderTypeTrialAdditionalDirectionsBuildingDispute")
+    ORDER_TYPE_TRIAL_ADDITIONAL_DIRECTIONS_BUILDING_DISPUTE,
+
+    @JsonProperty("OrderTypeTrialAdditionalDirectionsClinicalNegligence")
+    ORDER_TYPE_TRIAL_ADDITIONAL_DIRECTIONS_CLINICAL_NEGLIGENCE,
+
+    @JsonProperty("OrderTypeTrialAdditionalDirectionsCreditHire")
+    ORDER_TYPE_TRIAL_ADDITIONAL_DIRECTIONS_CREDIT_HIRE,
+
+    @JsonProperty("OrderTypeTrialAdditionalDirectionsEmployersLiability")
+    ORDER_TYPE_TRIAL_ADDITIONAL_DIRECTIONS_EMPLOYERS_LIABILITY,
+
+    @JsonProperty("OrderTypeTrialAdditionalDirectionsHousingDisrepair")
+    ORDER_TYPE_TRIAL_ADDITIONAL_DIRECTIONS_HOUSING_DISREPAIR,
+
+    @JsonProperty("OrderTypeTrialAdditionalDirectionsPersonalInjury")
+    ORDER_TYPE_TRIAL_ADDITIONAL_DIRECTIONS_PERSONAL_INJURY,
+
+    @JsonProperty("OrderTypeTrialAdditionalDirectionsRoadTrafficAccident")
+    ORDER_TYPE_TRIAL_ADDITIONAL_DIRECTIONS_ROAD_TRAFFIC_ACCIDENT
 }

src/main/java/uk/gov/hmcts/reform/civil/enums/dj/DisposalHearingMethodDJ.java

@@ -1,5 +1,14 @@
 package uk.gov.hmcts.reform.civil.enums.dj;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
+
 public enum DisposalHearingMethodDJ {
-    disposalHearingMethodInPerson, disposalHearingMethodVideoConferenceHearing, disposalHearingMethodTelephoneHearing
+    @JsonProperty("disposalHearingMethodInPerson")
+    DISPOSAL_HEARING_METHOD_IN_PERSON,
+
+    @JsonProperty("disposalHearingMethodVideoConferenceHearing")
+    DISPOSAL_HEARING_METHOD_VIDEO_CONFERENCE_HEARING,
+
+    @JsonProperty("disposalHearingMethodTelephoneHearing")
+    DISPOSAL_HEARING_METHOD_TELEPHONE_HEARING
 }

src/main/java/uk/gov/hmcts/reform/civil/enums/dj/HearingMethodTelephoneHearingDJ.java

@@ -1,18 +1,23 @@
 package uk.gov.hmcts.reform.civil.enums.dj;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Getter;
 
 @Getter
 public enum HearingMethodTelephoneHearingDJ {
-    telephoneTheClaimant("the claimant"),
-    telephoneTheDefendant("the defendant"),
-    telephoneTheCourt("the court");
+    @JsonProperty("telephoneTheClaimant")
+    TELEPHONE_THE_CLAIMANT("the claimant"),
 
-    private String label;
+    @JsonProperty("telephoneTheDefendant")
+    TELEPHONE_THE_DEFENDANT("the defendant"),
+
+    @JsonProperty("telephoneTheCourt")
+    TELEPHONE_THE_COURT("the court");
+
+    private final String label;
 
     HearingMethodTelephoneHearingDJ(String value) {
         this.label = value;
     }
 
 }
-

src/main/java/uk/gov/hmcts/reform/civil/enums/dj/HearingMethodVideoConferenceDJ.java

@@ -1,18 +1,23 @@
 package uk.gov.hmcts.reform.civil.enums.dj;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Getter;
 
 @Getter
 public enum HearingMethodVideoConferenceDJ {
-    videoTheClaimant("the claimant"),
-    videoTheDefendant("the defendant"),
-    videoTheCourt("the court");
+    @JsonProperty("videoTheClaimant")
+    VIDEO_THE_CLAIMANT("the claimant"),
 
-    private String label;
+    @JsonProperty("videoTheDefendant")
+    VIDEO_THE_DEFENDANT("the defendant"),
+
+    @JsonProperty("videoTheCourt")
+    VIDEO_THE_COURT("the court");
+
+    private final String label;
 
     HearingMethodVideoConferenceDJ(String value) {
         this.label = value;
     }
 
 }
-

src/main/java/uk/gov/hmcts/reform/civil/service/dj/DjLocationAndToggleService.java

@@ -86,21 +86,21 @@ public CaseData applyHearingSelections(CaseData caseData, CallbackVersion versio
 
     private void applyDisposalSelection(CaseData.CaseDataBuilder<?, ?> builder, String label) {
         if (HearingMethod.IN_PERSON.getLabel().equals(label)) {
-            builder.disposalHearingMethodDJ(DisposalHearingMethodDJ.disposalHearingMethodInPerson);
+            builder.disposalHearingMethodDJ(DisposalHearingMethodDJ.DISPOSAL_HEARING_METHOD_IN_PERSON);
         } else if (HearingMethod.VIDEO.getLabel().equals(label)) {
-            builder.disposalHearingMethodDJ(DisposalHearingMethodDJ.disposalHearingMethodVideoConferenceHearing);
+            builder.disposalHearingMethodDJ(DisposalHearingMethodDJ.DISPOSAL_HEARING_METHOD_VIDEO_CONFERENCE_HEARING);
         } else if (HearingMethod.TELEPHONE.getLabel().equals(label)) {
-            builder.disposalHearingMethodDJ(DisposalHearingMethodDJ.disposalHearingMethodTelephoneHearing);
+            builder.disposalHearingMethodDJ(DisposalHearingMethodDJ.DISPOSAL_HEARING_METHOD_TELEPHONE_HEARING);
         }
     }
 
     private void applyTrialSelection(CaseData.CaseDataBuilder<?, ?> builder, String label) {
         if (HearingMethod.IN_PERSON.getLabel().equals(label)) {
-            builder.trialHearingMethodDJ(DisposalHearingMethodDJ.disposalHearingMethodInPerson);
+            builder.trialHearingMethodDJ(DisposalHearingMethodDJ.DISPOSAL_HEARING_METHOD_IN_PERSON);
         } else if (HearingMethod.VIDEO.getLabel().equals(label)) {
-            builder.trialHearingMethodDJ(DisposalHearingMethodDJ.disposalHearingMethodVideoConferenceHearing);
+            builder.trialHearingMethodDJ(DisposalHearingMethodDJ.DISPOSAL_HEARING_METHOD_VIDEO_CONFERENCE_HEARING);
         } else if (HearingMethod.TELEPHONE.getLabel().equals(label)) {
-            builder.trialHearingMethodDJ(DisposalHearingMethodDJ.disposalHearingMethodTelephoneHearing);
+            builder.trialHearingMethodDJ(DisposalHearingMethodDJ.DISPOSAL_HEARING_METHOD_TELEPHONE_HEARING);
         }
     }
 

src/main/java/uk/gov/hmcts/reform/civil/service/docmosis/dj/DjDirectionsToggleService.java

@@ -8,7 +8,7 @@
 import java.util.List;
 
 import static java.util.Objects.nonNull;
-import static uk.gov.hmcts.reform.civil.enums.dj.CaseManagementOrderAdditional.OrderTypeTrialAdditionalDirectionsEmployersLiability;
+import static uk.gov.hmcts.reform.civil.enums.dj.CaseManagementOrderAdditional.ORDER_TYPE_TRIAL_ADDITIONAL_DIRECTIONS_EMPLOYERS_LIABILITY;
 import static uk.gov.hmcts.reform.civil.enums.dj.DisposalAndTrialHearingDJToggle.SHOW;
 
 /**
@@ -28,6 +28,6 @@ public boolean hasAdditionalDirections(CaseData caseData) {
 
     public boolean hasEmployerLiability(List<CaseManagementOrderAdditional> additionalDirections) {
         return nonNull(additionalDirections)
-            && additionalDirections.contains(OrderTypeTrialAdditionalDirectionsEmployersLiability);
+            && additionalDirections.contains(ORDER_TYPE_TRIAL_ADDITIONAL_DIRECTIONS_EMPLOYERS_LIABILITY);
     }
 }

src/main/java/uk/gov/hmcts/reform/civil/service/docmosis/dj/DjDisposalTemplateFieldService.java

@@ -25,9 +25,9 @@ public String getAttendanceLabel(DisposalHearingMethodDJ method) {
             return null;
         }
         return switch (method) {
-            case disposalHearingMethodTelephoneHearing -> "by telephone";
-            case disposalHearingMethodInPerson -> "in person";
-            case disposalHearingMethodVideoConferenceHearing -> "by video conference";
+            case DISPOSAL_HEARING_METHOD_TELEPHONE_HEARING -> "by telephone";
+            case DISPOSAL_HEARING_METHOD_IN_PERSON -> "in person";
+            case DISPOSAL_HEARING_METHOD_VIDEO_CONFERENCE_HEARING -> "by video conference";
         };
     }
 

src/main/java/uk/gov/hmcts/reform/civil/service/docmosis/dj/DjHearingMethodFieldService.java

@@ -6,7 +6,7 @@
 import uk.gov.hmcts.reform.civil.enums.dj.HearingMethodVideoConferenceDJ;
 import uk.gov.hmcts.reform.civil.model.CaseData;
 
-import static uk.gov.hmcts.reform.civil.enums.dj.DisposalHearingMethodDJ.disposalHearingMethodInPerson;
+import static uk.gov.hmcts.reform.civil.enums.dj.DisposalHearingMethodDJ.DISPOSAL_HEARING_METHOD_IN_PERSON;
 
 /**
  * Encapsulates telephone/video organiser strings and "in person" guards for DJ templates.
@@ -43,6 +43,6 @@ public String resolveVideoOrganisedBy(CaseData caseData) {
     }
 
     public boolean isInPerson(DisposalHearingMethodDJ method) {
-        return method != null && method.equals(disposalHearingMethodInPerson);
+        return method != null && method.equals(DISPOSAL_HEARING_METHOD_IN_PERSON);
     }
 }

src/test/java/uk/gov/hmcts/reform/civil/sampledata/CaseDataBuilder.java

@@ -3005,7 +3005,7 @@ public CaseDataBuilder atStateClaimIssuedTrialDJInPersonHearingNew() {
     }
 
     public CaseDataBuilder atStateClaimIssuedTrialSDOInPersonHearing() {
-        trialHearingMethodDJ = DisposalHearingMethodDJ.disposalHearingMethodInPerson;
+        trialHearingMethodDJ = DisposalHearingMethodDJ.DISPOSAL_HEARING_METHOD_IN_PERSON;
         return this;
     }
 
@@ -3016,7 +3016,7 @@ public CaseDataBuilder atStateClaimIssuedTrialSDOTelephoneHearingNew() {
     }
 
     public CaseDataBuilder atStateClaimIssuedTrialSDOTelephoneHearing() {
-        trialHearingMethodDJ = DisposalHearingMethodDJ.disposalHearingMethodTelephoneHearing;
+        trialHearingMethodDJ = DisposalHearingMethodDJ.DISPOSAL_HEARING_METHOD_TELEPHONE_HEARING;
         return this;
     }
 
@@ -3027,7 +3027,7 @@ public CaseDataBuilder atStateClaimIssuedTrialSDOVideoHearingNew() {
     }
 
     public CaseDataBuilder atStateClaimIssuedTrialSDOVideoHearing() {
-        trialHearingMethodDJ = DisposalHearingMethodDJ.disposalHearingMethodVideoConferenceHearing;
+        trialHearingMethodDJ = DisposalHearingMethodDJ.DISPOSAL_HEARING_METHOD_VIDEO_CONFERENCE_HEARING;
         return this;
     }
 
@@ -3127,7 +3127,7 @@ public CaseDataBuilder atStateClaimIssuedDisposalDJVideoCallNew() {
     }
 
     public CaseDataBuilder atStateClaimIssuedDisposalSDOVideoCall() {
-        disposalHearingMethodDJ = DisposalHearingMethodDJ.disposalHearingMethodVideoConferenceHearing;
+        disposalHearingMethodDJ = DisposalHearingMethodDJ.DISPOSAL_HEARING_METHOD_VIDEO_CONFERENCE_HEARING;
         return this;
     }
 

src/test/java/uk/gov/hmcts/reform/civil/service/dj/DjLocationAndToggleServiceTest.java

@@ -149,7 +149,7 @@ void shouldApplyDisposalHearingSelectionWhenVersionV1() {
         CaseData result = service.applyHearingSelections(caseData, V_1);
 
         assertThat(result.getDisposalHearingMethodDJ())
-            .isEqualTo(DisposalHearingMethodDJ.disposalHearingMethodTelephoneHearing);
+            .isEqualTo(DisposalHearingMethodDJ.DISPOSAL_HEARING_METHOD_TELEPHONE_HEARING);
     }
 
     @Test
@@ -163,7 +163,7 @@ void shouldApplyTrialHearingSelectionWhenDisposalNotPresent() {
         CaseData result = service.applyHearingSelections(caseData, V_1);
 
         assertThat(result.getTrialHearingMethodDJ())
-            .isEqualTo(DisposalHearingMethodDJ.disposalHearingMethodVideoConferenceHearing);
+            .isEqualTo(DisposalHearingMethodDJ.DISPOSAL_HEARING_METHOD_VIDEO_CONFERENCE_HEARING);
     }
 
     @Test
@@ -186,7 +186,7 @@ void shouldApplyInPersonSelectionForDisposalHearing() {
         CaseData result = service.applyHearingSelections(caseData, V_1);
 
         assertThat(result.getDisposalHearingMethodDJ())
-            .isEqualTo(DisposalHearingMethodDJ.disposalHearingMethodInPerson);
+            .isEqualTo(DisposalHearingMethodDJ.DISPOSAL_HEARING_METHOD_IN_PERSON);
     }
 
     @Test
@@ -200,7 +200,7 @@ void shouldApplyTelephoneSelectionForTrialHearingWhenDisposalNotProvided() {
         CaseData result = service.applyHearingSelections(caseData, V_1);
 
         assertThat(result.getTrialHearingMethodDJ())
-            .isEqualTo(DisposalHearingMethodDJ.disposalHearingMethodTelephoneHearing);
+            .isEqualTo(DisposalHearingMethodDJ.DISPOSAL_HEARING_METHOD_TELEPHONE_HEARING);
     }
 
     @Test

src/test/java/uk/gov/hmcts/reform/civil/service/docmosis/dj/DjDirectionsToggleServiceTest.java

@@ -36,7 +36,7 @@ void shouldDetectAdditionalDirections() {
     @Test
     void shouldDetectEmployerLiability() {
         assertThat(service.hasEmployerLiability(
-            List.of(CaseManagementOrderAdditional.OrderTypeTrialAdditionalDirectionsEmployersLiability)
+            List.of(CaseManagementOrderAdditional.ORDER_TYPE_TRIAL_ADDITIONAL_DIRECTIONS_EMPLOYERS_LIABILITY)
         )).isTrue();
     }
 }

src/test/java/uk/gov/hmcts/reform/civil/service/docmosis/dj/DjDisposalTemplateFieldServiceTest.java

@@ -30,11 +30,11 @@ void shouldResolveCourtLocationLabel() {
 
     @Test
     void shouldRenderAttendanceLabels() {
-        assertThat(service.getAttendanceLabel(DisposalHearingMethodDJ.disposalHearingMethodInPerson))
+        assertThat(service.getAttendanceLabel(DisposalHearingMethodDJ.DISPOSAL_HEARING_METHOD_IN_PERSON))
             .isEqualTo("in person");
-        assertThat(service.getAttendanceLabel(DisposalHearingMethodDJ.disposalHearingMethodTelephoneHearing))
+        assertThat(service.getAttendanceLabel(DisposalHearingMethodDJ.DISPOSAL_HEARING_METHOD_TELEPHONE_HEARING))
             .isEqualTo("by telephone");
-        assertThat(service.getAttendanceLabel(DisposalHearingMethodDJ.disposalHearingMethodVideoConferenceHearing))
+        assertThat(service.getAttendanceLabel(DisposalHearingMethodDJ.DISPOSAL_HEARING_METHOD_VIDEO_CONFERENCE_HEARING))
             .isEqualTo("by video conference");
     }
 

src/test/java/uk/gov/hmcts/reform/civil/service/docmosis/dj/DjHearingMethodFieldServiceTest.java

@@ -16,7 +16,7 @@ class DjHearingMethodFieldServiceTest {
     @Test
     void shouldResolveTelephoneFromDisposal() {
         CaseData caseData = CaseDataBuilder.builder().build().toBuilder()
-            .disposalHearingMethodTelephoneHearingDJ(HearingMethodTelephoneHearingDJ.telephoneTheCourt)
+            .disposalHearingMethodTelephoneHearingDJ(HearingMethodTelephoneHearingDJ.TELEPHONE_THE_COURT)
             .build();
 
         assertThat(service.resolveTelephoneOrganisedBy(caseData)).isEqualTo("the court");
@@ -25,7 +25,7 @@ void shouldResolveTelephoneFromDisposal() {
     @Test
     void shouldFallbackToTrialTelephone() {
         CaseData caseData = CaseDataBuilder.builder().build().toBuilder()
-            .trialHearingMethodTelephoneHearingDJ(HearingMethodTelephoneHearingDJ.telephoneTheDefendant)
+            .trialHearingMethodTelephoneHearingDJ(HearingMethodTelephoneHearingDJ.TELEPHONE_THE_DEFENDANT)
             .build();
 
         assertThat(service.resolveTelephoneOrganisedBy(caseData)).isEqualTo("the defendant");
@@ -34,7 +34,7 @@ void shouldFallbackToTrialTelephone() {
     @Test
     void shouldResolveVideoFromDisposal() {
         CaseData caseData = CaseDataBuilder.builder().build().toBuilder()
-            .disposalHearingMethodVideoConferenceHearingDJ(HearingMethodVideoConferenceDJ.videoTheCourt)
+            .disposalHearingMethodVideoConferenceHearingDJ(HearingMethodVideoConferenceDJ.VIDEO_THE_COURT)
             .build();
 
         assertThat(service.resolveVideoOrganisedBy(caseData)).isEqualTo("the court");
@@ -43,15 +43,15 @@ void shouldResolveVideoFromDisposal() {
     @Test
     void shouldFallbackToTrialVideo() {
         CaseData caseData = CaseDataBuilder.builder().build().toBuilder()
-            .trialHearingMethodVideoConferenceHearingDJ(HearingMethodVideoConferenceDJ.videoTheDefendant)
+            .trialHearingMethodVideoConferenceHearingDJ(HearingMethodVideoConferenceDJ.VIDEO_THE_DEFENDANT)
             .build();
 
         assertThat(service.resolveVideoOrganisedBy(caseData)).isEqualTo("the defendant");
     }
 
     @Test
     void shouldDetectInPerson() {
-        assertThat(service.isInPerson(DisposalHearingMethodDJ.disposalHearingMethodInPerson)).isTrue();
-        assertThat(service.isInPerson(DisposalHearingMethodDJ.disposalHearingMethodTelephoneHearing)).isFalse();
+        assertThat(service.isInPerson(DisposalHearingMethodDJ.DISPOSAL_HEARING_METHOD_IN_PERSON)).isTrue();
+        assertThat(service.isInPerson(DisposalHearingMethodDJ.DISPOSAL_HEARING_METHOD_TELEPHONE_HEARING)).isFalse();
     }
 }