From 6ac7865e3bf3c87f05fa1526ecfc4817f27b1709 Mon Sep 17 00:00:00 2001 From: Daniel D'Avella Date: Tue, 28 May 2024 10:01:51 -0400 Subject: [PATCH] Fix new failure property --- .../io/codemodder/codetf/CodeTFResult.java | 22 +++++++++++-------- .../{FailureState.java => Failure.java} | 11 ++-------- .../codemodder/codetf/CodeTFResultTest.java | 3 +-- 3 files changed, 16 insertions(+), 20 deletions(-) rename src/main/java/io/codemodder/codetf/{FailureState.java => Failure.java} (70%) diff --git a/src/main/java/io/codemodder/codetf/CodeTFResult.java b/src/main/java/io/codemodder/codetf/CodeTFResult.java index 3b8f523..8809c2a 100644 --- a/src/main/java/io/codemodder/codetf/CodeTFResult.java +++ b/src/main/java/io/codemodder/codetf/CodeTFResult.java @@ -12,7 +12,7 @@ public final class CodeTFResult { private final String summary; private final String description; private final DetectionTool detectionTool; - private final FailureState failureState; + private final Failure failure; private final Set failedFiles; private final List references; private final Map properties; @@ -25,7 +25,7 @@ public CodeTFResult( @JsonProperty(value = "summary", index = 2) final String summary, @JsonProperty(value = "description", index = 3) final String description, @JsonProperty(value = "detectionTool", index = 4) final DetectionTool detectionTool, - @JsonProperty(value = "failureState", index = 5) final FailureState failureState, + @JsonProperty(value = "failure", index = 5) final Failure failure, @JsonProperty(value = "failedFiles", index = 6) final Set failedFiles, @JsonProperty(value = "references", index = 7) final List references, @JsonProperty(value = "properties", index = 8) final Map properties, @@ -35,7 +35,7 @@ public CodeTFResult( this.summary = CodeTFValidator.requireNonBlank(summary); this.description = CodeTFValidator.requireNonBlank(description); this.detectionTool = detectionTool; - this.failureState = failureState; + this.failure = failure; this.failedFiles = CodeTFValidator.toImmutableCopyOrEmptyOnNull(failedFiles); this.references = CodeTFValidator.toImmutableCopyOrEmptyOnNull(references); this.properties = CodeTFValidator.toImmutableCopyOrEmptyOnNull(properties); @@ -68,8 +68,12 @@ public DetectionTool getDetectionTool() { return detectionTool; } - public FailureState getFailureState() { - return failureState; + public Failure getFailureState() { + return failure; + } + + public boolean failed() { + return failure != null; } public Set getFailedFiles() { @@ -116,7 +120,7 @@ public static class Builder { private String updatedSummary; private String updatedDescription; - private FailureState failureState; + private Failure failure; private List updatedReferences; private DetectionTool detectionTool; private List changeset; @@ -140,8 +144,8 @@ public Builder withDescription(final String description) { return this; } - public Builder withFailureState(final FailureState failureState) { - this.failureState = failureState; + public Builder withFailureState(final Failure failure) { + this.failure = failure; return this; } @@ -185,7 +189,7 @@ public CodeTFResult build() { updatedSummary != null ? updatedSummary : originalResult.getSummary(), updatedDescription != null ? updatedDescription : originalResult.getDescription(), detectionTool != null ? detectionTool : originalResult.getDetectionTool(), - failureState != null ? failureState : originalResult.getFailureState(), + failure != null ? failure : originalResult.getFailureState(), originalResult.getFailedFiles(), updatedReferences != null ? updatedReferences : originalResult.getReferences(), originalResult.getProperties(), diff --git a/src/main/java/io/codemodder/codetf/FailureState.java b/src/main/java/io/codemodder/codetf/Failure.java similarity index 70% rename from src/main/java/io/codemodder/codetf/FailureState.java rename to src/main/java/io/codemodder/codetf/Failure.java index 2145107..3d1f70d 100644 --- a/src/main/java/io/codemodder/codetf/FailureState.java +++ b/src/main/java/io/codemodder/codetf/Failure.java @@ -3,25 +3,18 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; -public class FailureState { - private final boolean failed; +public class Failure { private final String reason; private final String exception; @JsonCreator - public FailureState( - @JsonProperty("failed") final boolean failed, + public Failure( @JsonProperty("reason") final String reason, @JsonProperty("exception") final String exception) { - this.failed = failed; this.reason = reason; this.exception = exception; } - public boolean failed() { - return failed; - } - public String reason() { return reason; } diff --git a/src/test/java/io/codemodder/codetf/CodeTFResultTest.java b/src/test/java/io/codemodder/codetf/CodeTFResultTest.java index cd8f8ed..c987060 100644 --- a/src/test/java/io/codemodder/codetf/CodeTFResultTest.java +++ b/src/test/java/io/codemodder/codetf/CodeTFResultTest.java @@ -160,8 +160,7 @@ void it_has_changeset_with_ai() { @Test void it_has_failure_state() { - FailureState state = new FailureState(true, "reason", "exception"); - assertTrue(state.failed()); + Failure state = new Failure("reason", "exception"); assertEquals("reason", state.reason()); assertEquals("exception", state.exception()); }