Skip to content

Commit 372f1f6

Browse files
dhawes-chdhawes-ch
authored
Merge pull request #210 from companieshouse/feature/SIV-771-align-code-style
SIV-771 - Align code style
2 parents f8b1113 + 7838df9 commit 372f1f6

File tree

2 files changed

+65
-27
lines changed

2 files changed

+65
-27
lines changed

‎src/main/java/uk/gov/companieshouse/pscdataapi/models/PscIdentityVerificationDetails.java‎

Lines changed: 25 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import com.fasterxml.jackson.annotation.JsonProperty;
44
import org.springframework.format.annotation.DateTimeFormat;
5+
import org.springframework.lang.Nullable;
56
import uk.gov.companieshouse.api.psc.IdentityVerificationDetails;
67

78
import java.time.LocalDate;
@@ -11,32 +12,40 @@
1112
public class PscIdentityVerificationDetails {
1213

1314
@JsonProperty("anti_money_laundering_supervisory_bodies")
15+
@Nullable
1416
private List<String> antiMoneyLaunderingSupervisoryBodies;
1517

1618
@JsonProperty("appointment_verification_end_on")
1719
@DateTimeFormat(iso = DateTimeFormat.ISO.DATE)
20+
@Nullable
1821
private LocalDate appointmentVerificationEndOn;
1922

2023
@JsonProperty("appointment_verification_statement_date")
2124
@DateTimeFormat(iso = DateTimeFormat.ISO.DATE)
25+
@Nullable
2226
private LocalDate appointmentVerificationStatementDate;
2327

2428
@JsonProperty("appointment_verification_statement_due_on")
2529
@DateTimeFormat(iso = DateTimeFormat.ISO.DATE)
30+
@Nullable
2631
private LocalDate appointmentVerificationStatementDueOn;
2732

2833
@JsonProperty("appointment_verification_start_on")
2934
@DateTimeFormat(iso = DateTimeFormat.ISO.DATE)
35+
@Nullable
3036
private LocalDate appointmentVerificationStartOn;
3137

3238
@JsonProperty("authorised_corporate_service_provider_name")
39+
@Nullable
3340
private String authorisedCorporateServiceProviderName;
3441

3542
@JsonProperty("identity_verified_on")
3643
@DateTimeFormat(iso = DateTimeFormat.ISO.DATE)
44+
@Nullable
3745
private LocalDate identityVerifiedOn;
3846

3947
@JsonProperty("preferred_name")
48+
@Nullable
4049
private String preferredName;
4150

4251
public PscIdentityVerificationDetails(){}
@@ -57,67 +66,75 @@ public PscIdentityVerificationDetails(IdentityVerificationDetails identityVerifi
5766
this.preferredName = identityVerificationDetails.getPreferredName();
5867
}
5968

69+
@Nullable
6070
public List<String> getAntiMoneyLaunderingSupervisoryBodies() {
6171
return antiMoneyLaunderingSupervisoryBodies;
6272
}
6373

64-
public void setAntiMoneyLaunderingSupervisoryBodies(List<String> antiMoneyLaunderingSupervisoryBodies) {
74+
public void setAntiMoneyLaunderingSupervisoryBodies(@Nullable List<String> antiMoneyLaunderingSupervisoryBodies) {
6575
this.antiMoneyLaunderingSupervisoryBodies = antiMoneyLaunderingSupervisoryBodies;
6676
}
6777

78+
@Nullable
6879
public LocalDate getAppointmentVerificationEndOn() {
6980
return appointmentVerificationEndOn;
7081
}
7182

72-
public void setAppointmentVerificationEndOn(LocalDate appointmentVerificationEndOn) {
83+
public void setAppointmentVerificationEndOn(@Nullable LocalDate appointmentVerificationEndOn) {
7384
this.appointmentVerificationEndOn = appointmentVerificationEndOn;
7485
}
7586

87+
@Nullable
7688
public LocalDate getAppointmentVerificationStatementDate() {
7789
return appointmentVerificationStatementDate;
7890
}
7991

80-
public void setAppointmentVerificationStatementDate(LocalDate appointmentVerificationStatementDate) {
92+
public void setAppointmentVerificationStatementDate(@Nullable LocalDate appointmentVerificationStatementDate) {
8193
this.appointmentVerificationStatementDate = appointmentVerificationStatementDate;
8294
}
8395

96+
@Nullable
8497
public LocalDate getAppointmentVerificationStatementDueOn() {
8598
return appointmentVerificationStatementDueOn;
8699
}
87100

88-
public void setAppointmentVerificationStatementDueOn(LocalDate appointmentVerificationStatementDueOn) {
101+
public void setAppointmentVerificationStatementDueOn(@Nullable LocalDate appointmentVerificationStatementDueOn) {
89102
this.appointmentVerificationStatementDueOn = appointmentVerificationStatementDueOn;
90103
}
91104

105+
@Nullable
92106
public LocalDate getAppointmentVerificationStartOn() {
93107
return appointmentVerificationStartOn;
94108
}
95109

96-
public void setAppointmentVerificationStartOn(LocalDate appointmentVerificationStartOn) {
110+
public void setAppointmentVerificationStartOn(@Nullable LocalDate appointmentVerificationStartOn) {
97111
this.appointmentVerificationStartOn = appointmentVerificationStartOn;
98112
}
99113

114+
@Nullable
100115
public String getAuthorisedCorporateServiceProviderName() {
101116
return authorisedCorporateServiceProviderName;
102117
}
103118

104-
public void setAuthorisedCorporateServiceProviderName(String authorisedCorporateServiceProviderName) {
119+
public void setAuthorisedCorporateServiceProviderName(@Nullable String authorisedCorporateServiceProviderName) {
105120
this.authorisedCorporateServiceProviderName = authorisedCorporateServiceProviderName;
106121
}
107122

123+
@Nullable
108124
public LocalDate getIdentityVerifiedOn() {
109125
return identityVerifiedOn;
110126
}
111127

112-
public void setIdentityVerifiedOn(LocalDate identityVerifiedOn) {
128+
public void setIdentityVerifiedOn(@Nullable LocalDate identityVerifiedOn) {
113129
this.identityVerifiedOn = identityVerifiedOn;
114130
}
115131

132+
@Nullable
116133
public String getPreferredName() {
117134
return preferredName;
118135
}
119136

120-
public void setPreferredName(String preferredName) {
137+
public void setPreferredName(@Nullable String preferredName) {
121138
this.preferredName = preferredName;
122139
}
123140

‎src/main/java/uk/gov/companieshouse/pscdataapi/transform/CompanyPscTransformer.java‎

Lines changed: 40 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -4,23 +4,44 @@
44

55
import java.time.LocalDate;
66
import java.time.format.DateTimeFormatter;
7-
import java.util.function.Consumer;
8-
7+
import java.util.Optional;
98
import org.springframework.stereotype.Component;
109
import uk.gov.companieshouse.api.model.common.Date3Tuple;
1110
import uk.gov.companieshouse.api.model.psc.NameElementsApi;
1211
import uk.gov.companieshouse.api.model.psc.PscIndividualWithIdentityVerificationDetailsApi;
1312
import uk.gov.companieshouse.api.model.psc.PscLinks;
14-
import uk.gov.companieshouse.api.psc.*;
13+
import uk.gov.companieshouse.api.psc.CorporateEntity;
14+
import uk.gov.companieshouse.api.psc.CorporateEntityBeneficialOwner;
15+
import uk.gov.companieshouse.api.psc.Data;
16+
import uk.gov.companieshouse.api.psc.ExternalData;
17+
import uk.gov.companieshouse.api.psc.FullRecordCompanyPSCApi;
18+
import uk.gov.companieshouse.api.psc.Identification;
19+
import uk.gov.companieshouse.api.psc.IdentityVerificationDetails;
20+
import uk.gov.companieshouse.api.psc.Individual;
21+
import uk.gov.companieshouse.api.psc.IndividualBeneficialOwner;
22+
import uk.gov.companieshouse.api.psc.IndividualFullRecord;
23+
import uk.gov.companieshouse.api.psc.InternalData;
24+
import uk.gov.companieshouse.api.psc.LegalPerson;
25+
import uk.gov.companieshouse.api.psc.LegalPersonBeneficialOwner;
26+
import uk.gov.companieshouse.api.psc.ListSummary;
27+
import uk.gov.companieshouse.api.psc.SensitiveData;
28+
import uk.gov.companieshouse.api.psc.SuperSecure;
29+
import uk.gov.companieshouse.api.psc.SuperSecureBeneficialOwner;
1530
import uk.gov.companieshouse.logging.Logger;
1631
import uk.gov.companieshouse.logging.LoggerFactory;
1732
import uk.gov.companieshouse.pscdataapi.data.IndividualPscRoles;
1833
import uk.gov.companieshouse.pscdataapi.data.SecurePscRoles;
1934
import uk.gov.companieshouse.pscdataapi.logging.DataMapHolder;
20-
import uk.gov.companieshouse.pscdataapi.models.*;
2135
import uk.gov.companieshouse.pscdataapi.models.Address;
2236
import uk.gov.companieshouse.pscdataapi.models.DateOfBirth;
37+
import uk.gov.companieshouse.pscdataapi.models.Links;
2338
import uk.gov.companieshouse.pscdataapi.models.NameElements;
39+
import uk.gov.companieshouse.pscdataapi.models.PscData;
40+
import uk.gov.companieshouse.pscdataapi.models.PscDocument;
41+
import uk.gov.companieshouse.pscdataapi.models.PscIdentification;
42+
import uk.gov.companieshouse.pscdataapi.models.PscIdentityVerificationDetails;
43+
import uk.gov.companieshouse.pscdataapi.models.PscSensitiveData;
44+
import uk.gov.companieshouse.pscdataapi.models.Updated;
2445
import uk.gov.companieshouse.pscdataapi.util.PscTransformationHelper;
2546

2647
@Component
@@ -656,22 +677,22 @@ private IdentityVerificationDetails mapIdentityVerificationDetails(final PscIden
656677

657678
IdentityVerificationDetails ivd = new IdentityVerificationDetails();
658679

659-
setIfNotNull(ivd::setAntiMoneyLaunderingSupervisoryBodies, details.getAntiMoneyLaunderingSupervisoryBodies());
660-
setIfNotNull(ivd::setAppointmentVerificationEndOn, details.getAppointmentVerificationEndOn());
661-
setIfNotNull(ivd::setAppointmentVerificationStatementDate, details.getAppointmentVerificationStatementDate());
662-
setIfNotNull(ivd::setAppointmentVerificationStatementDueOn, details.getAppointmentVerificationStatementDueOn());
663-
setIfNotNull(ivd::setAppointmentVerificationStartOn, details.getAppointmentVerificationStartOn());
664-
setIfNotNull(ivd::setAuthorisedCorporateServiceProviderName, details.getAuthorisedCorporateServiceProviderName());
665-
setIfNotNull(ivd::setIdentityVerifiedOn, details.getIdentityVerifiedOn());
666-
setIfNotNull(ivd::setPreferredName, details.getPreferredName());
680+
Optional<LocalDate> appointmentVerificationEndOn = Optional.ofNullable(details.getAppointmentVerificationEndOn());
681+
Optional<LocalDate> appointmentVerificationStatementDate = Optional.ofNullable(details.getAppointmentVerificationStatementDate());
682+
Optional<LocalDate> appointmentVerificationStatementDueOn = Optional.ofNullable(details.getAppointmentVerificationStatementDueOn());
683+
Optional<LocalDate> appointmentVerificationStartOn = Optional.ofNullable(details.getAppointmentVerificationStartOn());
684+
Optional<LocalDate> identityVerifiedOn = Optional.ofNullable(details.getIdentityVerifiedOn());
667685

668-
return ivd;
669-
}
686+
appointmentVerificationEndOn.ifPresent(ivd::setAppointmentVerificationEndOn);
687+
appointmentVerificationStatementDate.ifPresent(ivd::setAppointmentVerificationStatementDate);
688+
appointmentVerificationStatementDueOn.ifPresent(ivd::setAppointmentVerificationStatementDueOn);
689+
appointmentVerificationStartOn.ifPresent(ivd::setAppointmentVerificationStartOn);
690+
identityVerifiedOn.ifPresent(ivd::setIdentityVerifiedOn);
670691

671-
private <T> void setIfNotNull(Consumer<T> setter, T value) {
672-
if (value != null) {
673-
setter.accept(value);
674-
}
675-
}
692+
ivd.setAuthorisedCorporateServiceProviderName(details.getAuthorisedCorporateServiceProviderName());
693+
ivd.setAntiMoneyLaunderingSupervisoryBodies(details.getAntiMoneyLaunderingSupervisoryBodies());
694+
ivd.setPreferredName(details.getPreferredName());
676695

696+
return ivd;
697+
}
677698
}

0 commit comments

Comments
 (0)