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

DTSCCI-480 Remove Spring context #5128

Merged
merged 9 commits into from
Jul 22, 2024
Original file line number Diff line number Diff line change
Expand Up @@ -4,21 +4,24 @@
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import uk.gov.hmcts.reform.civil.enums.CaseRole;

import java.time.LocalDateTime;

@Data
@Builder(toBuilder = true)
@NoArgsConstructor
@AllArgsConstructor
public class CaseDocument {

private final Document documentLink;
private final String documentName;
private final DocumentType documentType;
private final long documentSize;
private final LocalDateTime createdDatetime;
private final String createdBy;
private final CaseRole ownedBy;
private Document documentLink;
private String documentName;
private DocumentType documentType;
private long documentSize;
private LocalDateTime createdDatetime;
private String createdBy;
private CaseRole ownedBy;

@JsonIgnore
public static CaseDocument toCaseDocument(Document document, DocumentType documentType) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,10 @@

import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.annotation.JsonIgnore;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import uk.gov.hmcts.reform.civil.validation.groups.PaymentDateGroup;

import java.math.BigDecimal;
Expand All @@ -12,18 +14,20 @@

@Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
public class RespondToClaim {

/**
* money amount in pence.
*/
@JsonFormat(shape = JsonFormat.Shape.STRING)
private final BigDecimal howMuchWasPaid;
private BigDecimal howMuchWasPaid;
@PastOrPresent(message = "Date for when amount was paid must be today or in the past",
groups = PaymentDateGroup.class)
private final LocalDate whenWasThisAmountPaid;
private final PaymentMethod howWasThisAmountPaid;
private final String howWasThisAmountPaidOther;
private LocalDate whenWasThisAmountPaid;
private PaymentMethod howWasThisAmountPaid;
private String howWasThisAmountPaidOther;

@JsonIgnore
public String getExplanationOnHowTheAmountWasPaid() {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
package uk.gov.hmcts.reform.civil.model;

import com.fasterxml.jackson.annotation.JsonIgnore;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import uk.gov.hmcts.reform.civil.model.common.Element;
import uk.gov.hmcts.reform.civil.documentmanagement.model.Document;

Expand All @@ -13,6 +15,8 @@

@Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
public class ServedDocumentFiles {

private List<Element<DocumentWithRegex>> other;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,19 +4,21 @@
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;

import java.util.UUID;
import javax.validation.Valid;
import javax.validation.constraints.NotNull;

@Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
@JsonIgnoreProperties(ignoreUnknown = true)
public class Element<T> {

private final UUID id;
private UUID id;
@NotNull
@Valid
private final T value;
private T value;
}
Original file line number Diff line number Diff line change
@@ -1,14 +1,18 @@
package uk.gov.hmcts.reform.civil.model.dq;

import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import uk.gov.hmcts.reform.civil.enums.YesOrNo;

@Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
public class DisclosureOfElectronicDocuments {

private final YesOrNo reachedAgreement;
private final YesOrNo agreementLikely;
private final String reasonForNoAgreement;
private YesOrNo reachedAgreement;
private YesOrNo agreementLikely;
private String reasonForNoAgreement;
}
Original file line number Diff line number Diff line change
@@ -1,14 +1,18 @@
package uk.gov.hmcts.reform.civil.model.dq;

import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import uk.gov.hmcts.reform.civil.enums.YesOrNo;

@Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
public class DisclosureOfNonElectronicDocuments {

private final YesOrNo directionsForDisclosureProposed;
private final YesOrNo standardDirectionsRequired;
private final String bespokeDirections;
private YesOrNo directionsForDisclosureProposed;
private YesOrNo standardDirectionsRequired;
private String bespokeDirections;
}
12 changes: 8 additions & 4 deletions src/main/java/uk/gov/hmcts/reform/civil/model/dq/Experts.java
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
package uk.gov.hmcts.reform.civil.model.dq;

import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import uk.gov.hmcts.reform.civil.enums.ExpertReportsSent;
import uk.gov.hmcts.reform.civil.enums.YesOrNo;
import uk.gov.hmcts.reform.civil.model.common.Element;
Expand All @@ -10,10 +12,12 @@

@Data
@Builder(toBuilder = true)
@NoArgsConstructor
@AllArgsConstructor
public class Experts {

private final YesOrNo expertRequired;
private final ExpertReportsSent expertReportsSent;
private final YesOrNo jointExpertSuitable;
private final List<Element<Expert>> details;
private YesOrNo expertRequired;
private ExpertReportsSent expertReportsSent;
private YesOrNo jointExpertSuitable;
private List<Element<Expert>> details;
}
Original file line number Diff line number Diff line change
@@ -1,17 +1,21 @@
package uk.gov.hmcts.reform.civil.model.dq;

import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import uk.gov.hmcts.reform.civil.enums.YesOrNo;

import java.util.List;

@Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
public class FileDirectionsQuestionnaire {

private final List<String> explainedToClient;
private final YesOrNo oneMonthStayRequested;
private final YesOrNo reactionProtocolCompliedWith;
private final String reactionProtocolNotCompliedWithReason;
private List<String> explainedToClient;
private YesOrNo oneMonthStayRequested;
private YesOrNo reactionProtocolCompliedWith;
private String reactionProtocolNotCompliedWithReason;
}
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
import lombok.experimental.SuperBuilder;

import uk.gov.hmcts.reform.civil.documentmanagement.model.Document;
Expand All @@ -10,6 +11,7 @@

@Data
@SuperBuilder(toBuilder = true)
@NoArgsConstructor
@AllArgsConstructor
public class FixedRecoverableCosts {

Expand Down
Original file line number Diff line number Diff line change
@@ -1,15 +1,19 @@
package uk.gov.hmcts.reform.civil.model.dq;

import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import uk.gov.hmcts.reform.civil.enums.YesOrNo;

@Data
@Builder(toBuilder = true)
@NoArgsConstructor
@AllArgsConstructor
public class FurtherInformation {

private final YesOrNo futureApplications;
private final YesOrNo intentionToMakeFutureApplications;
private final String reasonForFutureApplications;
private final String otherInformationForJudge;
private YesOrNo futureApplications;
private YesOrNo intentionToMakeFutureApplications;
private String reasonForFutureApplications;
private String otherInformationForJudge;
}
14 changes: 9 additions & 5 deletions src/main/java/uk/gov/hmcts/reform/civil/model/dq/Hearing.java
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
package uk.gov.hmcts.reform.civil.model.dq;

import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import uk.gov.hmcts.reform.civil.enums.YesOrNo;
import uk.gov.hmcts.reform.civil.enums.dq.HearingLength;
import uk.gov.hmcts.reform.civil.model.UnavailableDate;
Expand All @@ -11,12 +13,14 @@

@Data
@Builder(toBuilder = true)
@NoArgsConstructor
@AllArgsConstructor
public class Hearing {

private final HearingLength hearingLength;
private final String hearingLengthHours;
private final String hearingLengthDays;
private final YesOrNo unavailableDatesRequired;
private final List<Element<UnavailableDate>> unavailableDates;
private HearingLength hearingLength;
private String hearingLengthHours;
private String hearingLengthDays;
private YesOrNo unavailableDatesRequired;
private List<Element<UnavailableDate>> unavailableDates;

}
Original file line number Diff line number Diff line change
@@ -1,21 +1,25 @@
package uk.gov.hmcts.reform.civil.model.dq;

import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import uk.gov.hmcts.reform.civil.enums.YesOrNo;
import uk.gov.hmcts.reform.civil.enums.dq.SupportRequirements;

import java.util.List;

@Data
@Builder(toBuilder = true)
@NoArgsConstructor
@AllArgsConstructor
public class HearingSupport {

// CIV-5557 to be removed
private final List<SupportRequirements> requirements;
private final String signLanguageRequired;
private final String languageToBeInterpreted;
private final String otherSupport;
private final YesOrNo supportRequirements;
private final String supportRequirementsAdditional;
private List<SupportRequirements> requirements;
private String signLanguageRequired;
private String languageToBeInterpreted;
private String otherSupport;
private YesOrNo supportRequirements;
private String supportRequirementsAdditional;
}
Original file line number Diff line number Diff line change
@@ -1,13 +1,17 @@
package uk.gov.hmcts.reform.civil.model.dq;

import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import uk.gov.hmcts.reform.civil.enums.YesOrNo;
import uk.gov.hmcts.reform.civil.model.common.DynamicList;
import uk.gov.hmcts.reform.civil.model.defaultjudgment.CaseLocationCivil;

@Data
@Builder(toBuilder = true)
@NoArgsConstructor
@AllArgsConstructor
public class RequestedCourt {

/**
Expand All @@ -16,11 +20,11 @@ public class RequestedCourt {
* @deprecated location is mandatory for all parties now
*/
@Deprecated(forRemoval = true)
private final YesOrNo requestHearingAtSpecificCourt;
private final String otherPartyPreferredSite;
private final String responseCourtCode;
private final String reasonForHearingAtSpecificCourt;
private final DynamicList responseCourtLocations;
private final CaseLocationCivil caseLocation;
private final String responseCourtName;
private YesOrNo requestHearingAtSpecificCourt;
private String otherPartyPreferredSite;
private String responseCourtCode;
private String reasonForHearingAtSpecificCourt;
private DynamicList responseCourtLocations;
private CaseLocationCivil caseLocation;
private String responseCourtName;
}
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,16 @@

import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import uk.gov.hmcts.reform.civil.enums.YesOrNo;

@Data
@Builder(toBuilder = true)
@NoArgsConstructor
public class VulnerabilityQuestions {

final YesOrNo vulnerabilityAdjustmentsRequired;
final String vulnerabilityAdjustments;
private YesOrNo vulnerabilityAdjustmentsRequired;
private String vulnerabilityAdjustments;

public VulnerabilityQuestions(YesOrNo vulnerabilityAdjustmentsRequired, String vulnerabilityAdjustments) {
this.vulnerabilityAdjustmentsRequired = vulnerabilityAdjustmentsRequired;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,14 +1,18 @@
package uk.gov.hmcts.reform.civil.model.dq;

import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import uk.gov.hmcts.reform.civil.enums.dq.Language;

@Data
@Builder(toBuilder = true)
@NoArgsConstructor
@AllArgsConstructor
public class WelshLanguageRequirements {

private final Language evidence;
private final Language court;
private final Language documents;
private Language evidence;
private Language court;
private Language documents;
}
Loading
Loading