Skip to content

Commit e0a30ee

Browse files
committed
additional changes based on Tom Barnes feedback
1 parent 1efc7c2 commit e0a30ee

File tree

2 files changed

+7
-14
lines changed

2 files changed

+7
-14
lines changed

operator/src/main/java/oracle/kubernetes/operator/helpers/ConfigMapHelper.java

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -270,7 +270,7 @@ public NextAction apply(Packet packet) {
270270
if (topologyYaml != null) {
271271
LOGGER.fine("topology.yaml: " + topologyYaml);
272272
DomainTopology domainTopology = parseDomainTopologyYaml(topologyYaml);
273-
if (domainTopology.isDomainInvalid()) {
273+
if (!domainTopology.getDomainValid()) {
274274
// If introspector determines Domain is invalid then log erros and terminate the fiber
275275
logValidationErrors(domainTopology.getValidationErrors());
276276
return doNext(null, packet);
@@ -590,7 +590,11 @@ public static class DomainTopology {
590590
private List<String> validationErrors;
591591

592592
public boolean getDomainValid() {
593-
return this.domainValid;
593+
// domainValid = true AND no validation errors exist
594+
if (domainValid && getValidationErrors().isEmpty()) {
595+
return true;
596+
}
597+
return false;
594598
}
595599

596600
public void setDomainValid(boolean domainValid) {
@@ -616,7 +620,7 @@ public List<String> getValidationErrors() {
616620
// errors from introspector.
617621
validationErrors = new ArrayList<>();
618622
validationErrors.add(
619-
"Error, domain is marked invalid without error messages from introspector job.");
623+
"Error, domain is invalid although there are no validation errors from introspector job.");
620624
}
621625

622626
return validationErrors;
@@ -632,13 +636,5 @@ public String toString() {
632636
}
633637
return "domainValid: " + domainValid + ", validationErrors: " + validationErrors;
634638
}
635-
636-
boolean isDomainInvalid() {
637-
// domainValid = false OR validation errors exist
638-
if (!domainValid || !getValidationErrors().isEmpty()) {
639-
return true;
640-
}
641-
return false;
642-
}
643639
}
644640
}

operator/src/test/java/oracle/kubernetes/operator/helpers/ConfigMapHelperTest.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -567,7 +567,6 @@ public void parseMixedClusterTopologyYaml() {
567567

568568
assertNotNull(domainTopology);
569569
assertTrue(domainTopology.getDomainValid());
570-
assertFalse(domainTopology.isDomainInvalid());
571570

572571
WlsDomainConfig wlsDomainConfig = domainTopology.getDomain();
573572
assertNotNull(wlsDomainConfig);
@@ -597,7 +596,6 @@ public void parseInvalidTopologyYamlWithValidationErrors() {
597596

598597
assertFalse(domainTopology.getValidationErrors().isEmpty());
599598
assertFalse(domainTopology.getDomainValid());
600-
assertTrue(domainTopology.isDomainInvalid());
601599
assertEquals(
602600
"The dynamic cluster \"mycluster\"'s dynamic servers use calculated listen ports.",
603601
domainTopology.getValidationErrors().get(0));
@@ -610,6 +608,5 @@ public void parseInvalidTopologyYamlWithNoValidationErrors() {
610608

611609
assertFalse(domainTopology.getValidationErrors().isEmpty());
612610
assertFalse(domainTopology.getDomainValid());
613-
assertTrue(domainTopology.isDomainInvalid());
614611
}
615612
}

0 commit comments

Comments
 (0)