Skip to content

Commit

Permalink
DTSPB-4293 Fix Sonar issue
Browse files Browse the repository at this point in the history
  • Loading branch information
@IswaryaPepakayala
IswaryaPepakayala committed Nov 26, 2024
1 parent c9e7759 commit 26bd176
Show file tree
Hide file tree
Showing 2 changed files with 31 additions and 81 deletions.
60 changes: 15 additions & 45 deletions src/main/java/uk/gov/hmcts/probate/transformer/DocumentTransformer.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,57 +25,27 @@ public boolean hasDocumentWithType(List<Document> documents, DocumentType docume

public void addDocument(CallbackRequest callbackRequest, Document document, Boolean coversheetNotification) {
switch (document.getDocumentType()) {
case DIGITAL_GRANT_DRAFT:
case DIGITAL_GRANT:
case DIGITAL_GRANT_REISSUE_DRAFT:
case DIGITAL_GRANT_REISSUE:
case WELSH_DIGITAL_GRANT_REISSUE_DRAFT:
case WELSH_DIGITAL_GRANT_REISSUE:
case INTESTACY_GRANT_DRAFT:
case INTESTACY_GRANT:
case INTESTACY_GRANT_REISSUE_DRAFT:
case INTESTACY_GRANT_REISSUE:
case WELSH_INTESTACY_GRANT_REISSUE_DRAFT:
case WELSH_INTESTACY_GRANT_REISSUE:
case ADMON_WILL_GRANT_DRAFT:
case ADMON_WILL_GRANT:
case ADMON_WILL_GRANT_REISSUE_DRAFT:
case ADMON_WILL_GRANT_REISSUE:
case WELSH_ADMON_WILL_GRANT_REISSUE_DRAFT:
case WELSH_ADMON_WILL_GRANT_REISSUE:
case AD_COLLIGENDA_BONA_GRANT_DRAFT:
case AD_COLLIGENDA_BONA_GRANT:
case AD_COLLIGENDA_BONA_GRANT_REISSUE_DRAFT:
case AD_COLLIGENDA_BONA_GRANT_REISSUE:
case WELSH_AD_COLLIGENDA_BONA_GRANT_REISSUE_DRAFT:
case WELSH_AD_COLLIGENDA_BONA_GRANT_REISSUE:
case SOT_INFORMATION_REQUEST:
case GRANT_COVER:
case ASSEMBLED_LETTER:
case BLANK_LETTER:
case WELSH_DIGITAL_GRANT_DRAFT:
case WELSH_DIGITAL_GRANT:
case WELSH_ADMON_WILL_GRANT_DRAFT:
case WELSH_ADMON_WILL_GRANT:
case WELSH_INTESTACY_GRANT_DRAFT:
case WELSH_INTESTACY_GRANT:
case WELSH_AD_COLLIGENDA_BONA_GRANT_DRAFT:
case WELSH_AD_COLLIGENDA_BONA_GRANT:
case DIGITAL_GRANT_DRAFT, DIGITAL_GRANT, DIGITAL_GRANT_REISSUE_DRAFT, DIGITAL_GRANT_REISSUE,
WELSH_DIGITAL_GRANT_REISSUE_DRAFT, WELSH_DIGITAL_GRANT_REISSUE, INTESTACY_GRANT_DRAFT,
INTESTACY_GRANT, INTESTACY_GRANT_REISSUE_DRAFT, INTESTACY_GRANT_REISSUE,
WELSH_INTESTACY_GRANT_REISSUE_DRAFT, WELSH_INTESTACY_GRANT_REISSUE, ADMON_WILL_GRANT_DRAFT,
ADMON_WILL_GRANT, ADMON_WILL_GRANT_REISSUE_DRAFT, ADMON_WILL_GRANT_REISSUE,
WELSH_ADMON_WILL_GRANT_REISSUE_DRAFT, WELSH_ADMON_WILL_GRANT_REISSUE,
AD_COLLIGENDA_BONA_GRANT_DRAFT, AD_COLLIGENDA_BONA_GRANT, AD_COLLIGENDA_BONA_GRANT_REISSUE_DRAFT,
AD_COLLIGENDA_BONA_GRANT_REISSUE, WELSH_AD_COLLIGENDA_BONA_GRANT_REISSUE_DRAFT,
WELSH_AD_COLLIGENDA_BONA_GRANT_REISSUE, SOT_INFORMATION_REQUEST, GRANT_COVER, ASSEMBLED_LETTER,
BLANK_LETTER, WELSH_DIGITAL_GRANT_DRAFT, WELSH_DIGITAL_GRANT, WELSH_ADMON_WILL_GRANT_DRAFT,
WELSH_ADMON_WILL_GRANT, WELSH_INTESTACY_GRANT_DRAFT, WELSH_INTESTACY_GRANT,
WELSH_AD_COLLIGENDA_BONA_GRANT_DRAFT, WELSH_AD_COLLIGENDA_BONA_GRANT:
callbackRequest.getCaseDetails().getData().getProbateDocumentsGenerated()
.add(new CollectionMember<>(null, document));
break;
case STATEMENT_OF_TRUTH:
case WELSH_STATEMENT_OF_TRUTH:
case LEGAL_STATEMENT_PROBATE:
case LEGAL_STATEMENT_PROBATE_TRUST_CORPS:
case LEGAL_STATEMENT_INTESTACY:
case LEGAL_STATEMENT_ADMON:
case STATEMENT_OF_TRUTH, WELSH_STATEMENT_OF_TRUTH, LEGAL_STATEMENT_PROBATE,
LEGAL_STATEMENT_PROBATE_TRUST_CORPS, LEGAL_STATEMENT_INTESTACY, LEGAL_STATEMENT_ADMON:
callbackRequest.getCaseDetails().getData().getProbateSotDocumentsGenerated()
.add(new CollectionMember<>(null, document));
break;
case SENT_EMAIL:
case GRANT_RAISED:
case CAVEAT_STOPPED:
case SENT_EMAIL, GRANT_RAISED, CAVEAT_STOPPED:
callbackRequest.getCaseDetails().getData().getProbateNotificationsGenerated()
.add(new CollectionMember<>(null, document));
break;
Expand Down
52 changes: 16 additions & 36 deletions src/main/java/uk/gov/hmcts/probate/transformer/ReprintTransformer.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ private DynamicList getDocumentsAsDynamicList(CaseData caseData) {
listItems.addAll(caseData.getProbateDocumentsGenerated().stream()
.filter(doc -> isFromGeneratedDocuments(doc.getValue()))
.map(doc -> buildFromGeneratedDocument(doc.getValue()).get())
.collect(Collectors.toList()));
.toList());
}

if (caseData.getProbateSotDocumentsGenerated() != null && !caseData.getProbateSotDocumentsGenerated()
Expand Down Expand Up @@ -85,27 +85,16 @@ private boolean isFromScannedDOcuments(ScannedDocument document) {
}

private boolean isFromGeneratedDocuments(Document document) {
switch (document.getDocumentType()) {
case DIGITAL_GRANT:
case INTESTACY_GRANT:
case ADMON_WILL_GRANT:
case AD_COLLIGENDA_BONA_GRANT:
case WELSH_DIGITAL_GRANT:
case WELSH_INTESTACY_GRANT:
case WELSH_ADMON_WILL_GRANT:
case WELSH_AD_COLLIGENDA_BONA_GRANT:
return true;
case DIGITAL_GRANT_REISSUE:
case INTESTACY_GRANT_REISSUE:
case ADMON_WILL_GRANT_REISSUE:
case AD_COLLIGENDA_BONA_GRANT_REISSUE:
return true;
case STATEMENT_OF_TRUTH:
case WELSH_STATEMENT_OF_TRUTH:
return true;
default:
return false;
}
return switch (document.getDocumentType()) {
case DIGITAL_GRANT, INTESTACY_GRANT, ADMON_WILL_GRANT, AD_COLLIGENDA_BONA_GRANT, WELSH_DIGITAL_GRANT,
WELSH_INTESTACY_GRANT, WELSH_ADMON_WILL_GRANT, WELSH_AD_COLLIGENDA_BONA_GRANT ->
true;
case DIGITAL_GRANT_REISSUE, INTESTACY_GRANT_REISSUE, ADMON_WILL_GRANT_REISSUE,
AD_COLLIGENDA_BONA_GRANT_REISSUE ->
true;
case STATEMENT_OF_TRUTH, WELSH_STATEMENT_OF_TRUTH -> true;
default -> false;
};
}

private Optional<DynamicListItem> buildFromScannedDocument(ScannedDocument document) {
Expand All @@ -115,25 +104,16 @@ private Optional<DynamicListItem> buildFromScannedDocument(ScannedDocument docum
private Optional<DynamicListItem> buildFromGeneratedDocument(Document document) {
Optional<DynamicListItem> optionalDynamicListItem = Optional.empty();
switch (document.getDocumentType()) {
case DIGITAL_GRANT:
case INTESTACY_GRANT:
case ADMON_WILL_GRANT:
case AD_COLLIGENDA_BONA_GRANT:
case WELSH_DIGITAL_GRANT:
case WELSH_INTESTACY_GRANT:
case WELSH_ADMON_WILL_GRANT:
case WELSH_AD_COLLIGENDA_BONA_GRANT:
case DIGITAL_GRANT, INTESTACY_GRANT, ADMON_WILL_GRANT, AD_COLLIGENDA_BONA_GRANT, WELSH_DIGITAL_GRANT,
WELSH_INTESTACY_GRANT, WELSH_ADMON_WILL_GRANT, WELSH_AD_COLLIGENDA_BONA_GRANT:
optionalDynamicListItem = Optional.of(buildListItem(document.getDocumentFileName(), LABEL_GRANT));
break;
case DIGITAL_GRANT_REISSUE:
case INTESTACY_GRANT_REISSUE:
case ADMON_WILL_GRANT_REISSUE:
case AD_COLLIGENDA_BONA_GRANT_REISSUE:
case DIGITAL_GRANT_REISSUE, INTESTACY_GRANT_REISSUE, ADMON_WILL_GRANT_REISSUE,
AD_COLLIGENDA_BONA_GRANT_REISSUE:
optionalDynamicListItem =
Optional.of(buildListItem(document.getDocumentFileName(), LABEL_REISSUED_GRANT));
break;
case STATEMENT_OF_TRUTH:
case WELSH_STATEMENT_OF_TRUTH:
case STATEMENT_OF_TRUTH, WELSH_STATEMENT_OF_TRUTH:
optionalDynamicListItem = Optional.of(buildListItem(document.getDocumentFileName(), LABEL_SOT));
break;
default:
Expand Down

0 comments on commit 26bd176

Please sign in to comment.