Skip to content

Commit ddceacb

Browse files
committed
Updates per code review
1 parent f0a4677 commit ddceacb

File tree

3 files changed

+11
-14
lines changed

3 files changed

+11
-14
lines changed

library/src/main/java/com/digicert/validation/exceptions/AcmeValidationException.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ public AcmeValidationException(DcvError dcvError, AcmeValidationRequest acmeVali
1717
}
1818

1919
public AcmeValidationException(DcvError dcvError, AcmeValidationRequest acmeValidationRequest, DnssecDetails dnssecDetails) {
20-
super(Set.of(dcvError), null, dnssecDetails);
20+
super(Set.of(dcvError), dnssecDetails);
2121
this.acmeValidationRequest = acmeValidationRequest;
2222
}
2323

library/src/main/java/com/digicert/validation/exceptions/ValidationException.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,12 +45,11 @@ public ValidationException(Set<DcvError> errors) {
4545
/**
4646
* Constructs a new ValidationException with a set of specified DcvErrors and an optional cause.
4747
*
48-
* @param dcvErrors the set of DCV errors
49-
* @param cause the cause of the exception
48+
* @param dcvErrors the set of DCV errors
5049
* @param dnssecDetails the DNSSEC details associated with this exception
5150
*/
52-
public ValidationException(Set<DcvError> dcvErrors, Throwable cause, DnssecDetails dnssecDetails) {
53-
super(dcvErrors, cause, dnssecDetails);
51+
public ValidationException(Set<DcvError> dcvErrors, DnssecDetails dnssecDetails) {
52+
super(dcvErrors, null, dnssecDetails);
5453
}
5554

5655
}

library/src/main/java/com/digicert/validation/methods/dns/DnsValidator.java

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -139,16 +139,14 @@ public DomainValidationEvidence validate(DnsValidationRequest dnsValidationReque
139139
dnsValidationRequest.getDnsType().toString(),
140140
dnsValidationResponse.errors());
141141

142-
DnssecDetails dnssecDetails = null;
143-
if (dnsValidationResponse.mpicDetails() != null && dnsValidationResponse.mpicDetails().dnssecDetails() != null
144-
&& !dnsValidationResponse.mpicDetails().dnssecDetails().dnssecStatus().equals(DnssecStatus.NOT_CHECKED)) {
145-
dnssecDetails = dnsValidationResponse.mpicDetails().dnssecDetails();
146-
}
147-
if (dnssecDetails != null) {
148-
throw new ValidationException(dnsValidationResponse.errors(), null, dnssecDetails);
149-
} else {
150-
throw new ValidationException(dnsValidationResponse.errors());
142+
if (dnsValidationResponse.mpicDetails() != null &&
143+
dnsValidationResponse.mpicDetails().dnssecDetails() != null &&
144+
!dnsValidationResponse.mpicDetails().dnssecDetails().dnssecStatus().equals(DnssecStatus.NOT_CHECKED)) {
145+
DnssecDetails dnssecDetails = dnsValidationResponse.mpicDetails().dnssecDetails();
146+
throw new ValidationException(dnsValidationResponse.errors(), dnssecDetails);
151147
}
148+
149+
throw new ValidationException(dnsValidationResponse.errors());
152150
}
153151
}
154152

0 commit comments

Comments
 (0)