This is an automated email from the ASF dual-hosted git repository.
hansva pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/hop.git
The following commit(s) were added to refs/heads/main by this push:
new 0e353bfbe8 Fix#9497 Replace deprecated Result.getResult() calls with
isResult() (#9498)
0e353bfbe8 is described below
commit 0e353bfbe8068be3ff1ba939ffc86ffdc9ccef99
Author: Lance <[email protected]>
AuthorDate: Tue Nov 17 17:22:25 2026 +0800
Fix#9497 Replace deprecated Result.getResult() calls with isResult()
(#9498)
* Fix Replace deprecated Result.getResult() calls with isResult()
Signed-off-by: leehaut <[email protected]>
* Fix Replace deprecated Result.getResult() calls with isResult()
Signed-off-by: leehaut <[email protected]>
---------
Signed-off-by: leehaut <[email protected]>
---
core/src/main/java/org/apache/hop/core/Result.java | 42 ++++++----------------
.../test/java/org/apache/hop/core/ResultTest.java | 36 ++++++++++++++++---
.../modules/ROOT/pages/sdk/workflows.adoc | 6 ++--
.../modules/ROOT/pages/workflow/actions/eval.adoc | 2 +-
.../hop/lineage/LineageRunLifecycleEmitter.java | 8 ++---
.../loadbalance/LoadBalancingWorkflowEngine.java | 2 +-
.../ActionCheckDataCatalogTest.java | 40 ++++++++++-----------
.../columnsexist/ActionColumnsExistTest.java | 14 ++++----
.../actions/dbt/ActionDbtExecutionTest.java | 10 +++---
.../ActionDeleteExecutionInfoTest.java | 4 +--
.../ActionDeleteFoldersCheckTest.java | 2 +-
.../actions/http/ActionHttpConnectionTest.java | 10 +++---
.../actions/http/ActionHttpExecutionTest.java | 28 +++++++--------
.../workflow/actions/http/ActionHttpProxyTest.java | 16 ++++-----
.../ActionPGPEncryptFilesSignTest.java | 16 ++++-----
.../ActionSetVariablesBlankValueTest.java | 12 +++----
.../actions/tableexists/ActionTableExistsTest.java | 8 ++---
.../truncatetables/ActionTruncateTablesTest.java | 22 ++++++------
.../actions/unzip/WorkflowActionUnZipTest.java | 2 +-
.../actions/waitforsql/ActionWaitForSqlTest.java | 2 +-
.../ActionMssqlBulkLoadExecuteTest.java | 6 ++--
.../ActionMysqlBulkFileBlankFieldsTest.java | 4 +--
.../ActionMysqlBulkFileExecuteTest.java | 12 +++----
.../ActionMysqlBulkLoadBlankFieldsTest.java | 4 +--
.../ActionMysqlBulkLoadUnknownConnectionTest.java | 6 ++--
.../workflow/WorkflowReplayGateAfterActionXp.java | 4 +--
.../hop/replay/WorkflowReplayGateXpTest.java | 2 +-
.../org/apache/hop/lint/ActionRunLinterTest.java | 36 +++++++++++--------
.../workflow/actions/mail/WorkflowEntryTest.java | 2 +-
.../databricks/ActionDatabricksJobRunTest.java | 12 +++----
.../databricks/ActionDatabricksJobWaitTest.java | 8 ++---
.../neo4j/actions/cypherscript/CypherScript.java | 4 +--
.../hop/neo4j/actions/GraphActionFailuresTest.java | 8 ++---
.../cypherscript/CypherScriptTransactionTest.java | 15 +++-----
.../neo4j/shared/ThirdPartyGraphDialectTest.java | 9 ++---
35 files changed, 211 insertions(+), 203 deletions(-)
diff --git a/core/src/main/java/org/apache/hop/core/Result.java
b/core/src/main/java/org/apache/hop/core/Result.java
index ac2577230a..092a31712c 100644
--- a/core/src/main/java/org/apache/hop/core/Result.java
+++ b/core/src/main/java/org/apache/hop/core/Result.java
@@ -98,7 +98,7 @@ public class Result implements Cloneable {
/** The number of files retrieved. */
private long nrFilesRetrieved;
- /** The result of the workflow or pipeline, true if successful, false
otherwise. */
+ /** True when the workflow or pipeline execution succeeded. */
private boolean result;
/** The entry number. */
@@ -107,7 +107,10 @@ public class Result implements Cloneable {
/** The exit status. */
private int exitStatus;
- /** The rows resulting from the pipeline or workflow execution */
+ /**
+ * Rows produced by the workflow or pipeline. A later action can read them
to post-process the
+ * previous execution.
+ */
private List<RowMetaAndData> rows;
/** The result files. */
@@ -290,18 +293,6 @@ public class Result implements Cloneable {
+ (stopped ? " (Stopped)" : ", result=" + result);
}
- /**
- * Returns the resulting rowset from the workflow or pipeline. For example,
Result rows are used
- * in workflows where entries wish to receive the results of previous
executions of workflows or
- * pipelines. The Result rows can be used to do many kinds of pipeline or
workflow
- * post-processing.
- *
- * @return a List of rows associated with the result of execution of a
workflow or pipeline
- */
- public List<RowMetaAndData> getRows() {
- return rows;
- }
-
/**
* Sets the resulting rowset from the workflow or pipeline execution
*
@@ -616,36 +607,23 @@ public class Result implements Cloneable {
nrErrors += incr;
}
- public long getBytesReadThisAction() {
- return bytesReadThisAction;
- }
-
- public void setBytesReadThisAction(long bytesReadThisAction) {
- this.bytesReadThisAction = bytesReadThisAction;
- }
-
- public long getBytesWrittenThisAction() {
- return bytesWrittenThisAction;
- }
-
- public void setBytesWrittenThisAction(long bytesWrittenThisAction) {
- this.bytesWrittenThisAction = bytesWrittenThisAction;
- }
-
- @Deprecated(since = "2.16")
/**
* Returns whether the pipeline or workflow was successful.
*
+ * @return true if the execution was successful, false otherwise
* @deprecated Use {@link #isResult()} instead. This method remains for
backward compatibility and
* will be removed in a future release.
*/
+ @Deprecated(since = "2.16")
public boolean getResult() {
- return result;
+ return isResult();
}
/**
* Returns whether the pipeline or workflow execution was successful.
*
+ * <p>Written out: Lombok does not generate isResult() while the deprecated
getResult() exists.
+ *
* @return true if the execution was successful, false otherwise
*/
public boolean isResult() {
diff --git a/core/src/test/java/org/apache/hop/core/ResultTest.java
b/core/src/test/java/org/apache/hop/core/ResultTest.java
index dd312b55a8..eae3598b9d 100644
--- a/core/src/test/java/org/apache/hop/core/ResultTest.java
+++ b/core/src/test/java/org/apache/hop/core/ResultTest.java
@@ -90,7 +90,7 @@ class ResultTest {
Result result = resultWith(row(rowMeta, 1L, "a", payload), row(rowMeta,
2L, "b", null));
Result clone = result.clone();
- result.getRows().get(0).getData()[1] = "changed";
+ result.getRows().getFirst().getData()[1] = "changed";
payload[0] = 9;
rowMeta.getValueMeta(1).setName("renamed");
rowMeta.addValueMeta(new ValueMetaString("extra"));
@@ -99,8 +99,8 @@ class ResultTest {
assertEquals(
List.of("id", "name", "payload"),
List.of(clonedRow.getRowMeta().getFieldNames()));
}
- assertEquals("a", clone.getRows().get(0).getData()[1]);
- assertArrayEquals(new byte[] {1, 2, 3}, (byte[])
clone.getRows().get(0).getData()[2]);
+ assertEquals("a", clone.getRows().getFirst().getData()[1]);
+ assertArrayEquals(new byte[] {1, 2, 3}, (byte[])
clone.getRows().getFirst().getData()[2]);
}
@Test
@@ -112,7 +112,7 @@ class ResultTest {
List<RowMetaAndData> clonedRows = result.clone().getRows();
- IRowMeta clonedMeta = clonedRows.get(0).getRowMeta();
+ IRowMeta clonedMeta = clonedRows.getFirst().getRowMeta();
assertNotSame(shared, clonedMeta);
for (RowMetaAndData row : clonedRows) {
assertSame(clonedMeta, row.getRowMeta());
@@ -216,6 +216,32 @@ class ResultTest {
total.add(child);
}
assertEquals(Result.MAX_FAILURES, total.getFailures().size());
- assertSame(first, total.getFailures().get(0));
+ assertSame(first, total.getFailures().getFirst());
+ }
+
+ @Test
+ void isResultReadsTheSuccessFlag() throws Exception {
+ Result result = new Result();
+ assertFalse(result.isResult());
+
+ result.setResult(true);
+ assertTrue(result.isResult());
+
+ Result clone = result.clone();
+ Result lightClone = result.lightClone();
+ result.setResult(false);
+ assertTrue(clone.isResult());
+ assertTrue(lightClone.isResult());
+ assertFalse(result.isResult());
+
+ Result fromXml = new Result(XmlHandler.loadXmlString(result.getXml(),
Result.XML_TAG));
+ assertFalse(fromXml.isResult());
+
+ result.setResult(true);
+ fromXml = new Result(XmlHandler.loadXmlString(result.getXml(),
Result.XML_TAG));
+ assertTrue(fromXml.isResult());
+
+ String json = new ObjectMapper().writeValueAsString(result);
+ assertTrue(json.contains("\"result\":true"), json);
}
}
diff --git a/docs/hop-dev-manual/modules/ROOT/pages/sdk/workflows.adoc
b/docs/hop-dev-manual/modules/ROOT/pages/sdk/workflows.adoc
index 10e0cc9ff7..13dfbd12de 100644
--- a/docs/hop-dev-manual/modules/ROOT/pages/sdk/workflows.adoc
+++ b/docs/hop-dev-manual/modules/ROOT/pages/sdk/workflows.adoc
@@ -104,14 +104,14 @@ A `WorkflowHopMeta` between action A and action B can
behave in one of three way
----
hop.setUnconditional(true);
----
-* **On Success (Conditional)**: Action B executes only if Action A returned a
successful result (`result.getResult() == true`):
+* **On Success (Conditional)**: Action B executes only if Action A returned a
successful result (`result.isResult() == true`):
+
[source,java]
----
hop.setUnconditional(false);
hop.setEvaluation(true);
----
-* **On Failure (Conditional)**: Action B executes only if Action A failed
(`result.getResult() == false`):
+* **On Failure (Conditional)**: Action B executes only if Action A failed
(`result.isResult() == false`):
+
[source,java]
----
@@ -148,7 +148,7 @@ IWorkflowEngine<WorkflowMeta> workflowEngine =
WorkflowEngineFactory.createWorkf
Result result = workflowEngine.startExecution();
// Inspect outcome
-if (result.getResult() && result.getNrErrors() == 0) {
+if (result.isResult() && result.getNrErrors() == 0) {
System.out.println("Workflow succeeded!");
} else {
System.err.println("Workflow failed with " + result.getNrErrors() + "
errors.");
diff --git a/docs/hop-user-manual/modules/ROOT/pages/workflow/actions/eval.adoc
b/docs/hop-user-manual/modules/ROOT/pages/workflow/actions/eval.adoc
index bce63e5f33..f83efe4934 100644
--- a/docs/hop-user-manual/modules/ROOT/pages/workflow/actions/eval.adoc
+++ b/docs/hop-user-manual/modules/ROOT/pages/workflow/actions/eval.adoc
@@ -124,7 +124,7 @@ When a workflow action finishes, the result of the
execution will be a Result ob
[options="header"]
|===
|Expression|Alternative|Data type|Meaning
-|```previous_result.getResult()```||boolean|true if the previous workflow
action was executed successfully, false if there was some error.
+|```previous_result.isResult()```||boolean|true if the previous workflow
action was executed successfully, false if there was some error.
|```previous_result.getExitStatus()```|exit_status|int|exit status of previous
shell script workflow action
|```previous_result.getActionNr()```|nr|int|The action number is increased
every time a workflow action is executed.
|```previous_result.getNrErrors()```|errors|long|the number of errors, also
available as variable "errors".
diff --git
a/engine/src/main/java/org/apache/hop/lineage/LineageRunLifecycleEmitter.java
b/engine/src/main/java/org/apache/hop/lineage/LineageRunLifecycleEmitter.java
index e0289def82..3f899ccbe8 100644
---
a/engine/src/main/java/org/apache/hop/lineage/LineageRunLifecycleEmitter.java
+++
b/engine/src/main/java/org/apache/hop/lineage/LineageRunLifecycleEmitter.java
@@ -436,7 +436,7 @@ public final class LineageRunLifecycleEmitter {
ctx.putAttribute("errors", String.valueOf(result != null ?
result.getNrErrors() : 0));
if (result != null) {
ctx.putAttribute("nrErrors", String.valueOf(result.getNrErrors()));
- ctx.putAttribute("result", String.valueOf(result.getResult()));
+ ctx.putAttribute("result", String.valueOf(result.isResult()));
}
if (phase == RunLifecyclePhase.FINISHED || phase ==
RunLifecyclePhase.FAILED) {
ctx.putAttribute(OUTCOME, phase == RunLifecyclePhase.FAILED ? FAILED :
SUCCESS);
@@ -494,7 +494,7 @@ public final class LineageRunLifecycleEmitter {
if (r.getNrErrors() > 0) {
return true;
}
- return !r.getResult();
+ return !r.isResult();
}
return false;
}
@@ -605,7 +605,7 @@ public final class LineageRunLifecycleEmitter {
if (extension.actionExecutionResult != null) {
ctx.putAttribute("nrErrors",
String.valueOf(extension.actionExecutionResult.getNrErrors()));
- ctx.putAttribute("result",
String.valueOf(extension.actionExecutionResult.getResult()));
+ ctx.putAttribute("result",
String.valueOf(extension.actionExecutionResult.isResult()));
}
if (phase == RunLifecyclePhase.FINISHED || phase ==
RunLifecyclePhase.FAILED) {
@@ -628,6 +628,6 @@ public final class LineageRunLifecycleEmitter {
if (ar == null) {
return false;
}
- return ar.getNrErrors() > 0 || !ar.getResult();
+ return ar.getNrErrors() > 0 || !ar.isResult();
}
}
diff --git
a/engine/src/main/java/org/apache/hop/workflow/engines/loadbalance/LoadBalancingWorkflowEngine.java
b/engine/src/main/java/org/apache/hop/workflow/engines/loadbalance/LoadBalancingWorkflowEngine.java
index 94eb7d89f7..2a3eb6edd9 100644
---
a/engine/src/main/java/org/apache/hop/workflow/engines/loadbalance/LoadBalancingWorkflowEngine.java
+++
b/engine/src/main/java/org/apache/hop/workflow/engines/loadbalance/LoadBalancingWorkflowEngine.java
@@ -260,7 +260,7 @@ public class LoadBalancingWorkflowEngine extends
RemoteWorkflowEngine {
private void updateFinishedAssignmentAndState() {
try {
- boolean failed = result != null && (result.getNrErrors() > 0 ||
!result.getResult());
+ boolean failed = result != null && (result.getNrErrors() > 0 ||
!result.isResult());
if (assignment != null && coordinator != null) {
assignment.setStatus(
failed
diff --git
a/plugins/actions/checkdatacatalog/src/test/java/org/apache/hop/workflow/actions/checkdatacatalog/ActionCheckDataCatalogTest.java
b/plugins/actions/checkdatacatalog/src/test/java/org/apache/hop/workflow/actions/checkdatacatalog/ActionCheckDataCatalogTest.java
index 9a6841740d..bd2497d61f 100644
---
a/plugins/actions/checkdatacatalog/src/test/java/org/apache/hop/workflow/actions/checkdatacatalog/ActionCheckDataCatalogTest.java
+++
b/plugins/actions/checkdatacatalog/src/test/java/org/apache/hop/workflow/actions/checkdatacatalog/ActionCheckDataCatalogTest.java
@@ -198,7 +198,7 @@ class ActionCheckDataCatalogTest {
void aDatasetThatPassesEveryCheckGivesTrue() {
Result result = action().execute(new Result(), 0);
- assertTrue(result.getResult());
+ assertTrue(result.isResult());
assertEquals(0, result.getNrErrors());
}
@@ -208,7 +208,7 @@ class ActionCheckDataCatalogTest {
Result result = action().execute(new Result(), 0);
- assertFalse(result.getResult());
+ assertFalse(result.isResult());
assertEquals(0, result.getNrErrors());
}
@@ -216,31 +216,31 @@ class ActionCheckDataCatalogTest {
void aDeprecatedDatasetFailsOnlyWhenThatIsChecked() {
FakeCatalog.deprecation =
CatalogAnswer.known(new IDeprecationCapability.Deprecation(true, "Use
v2", null));
- assertFalse(action().execute(new Result(), 0).getResult());
+ assertFalse(action().execute(new Result(), 0).isResult());
ActionCheckDataCatalog action = action();
action.setCheckDeprecation(false);
- assertTrue(action.execute(new Result(), 0).getResult());
+ assertTrue(action.execute(new Result(), 0).isResult());
}
@Test
void dataOlderThanTheMaximumAgeFailsTheCheck() {
FakeCatalog.lastUpdated =
CatalogAnswer.known(Instant.now().minus(Duration.ofHours(2)));
- assertFalse(action().execute(new Result(), 0).getResult());
+ assertFalse(action().execute(new Result(), 0).isResult());
ActionCheckDataCatalog action = action();
action.setMaxAge("");
- assertTrue(action.execute(new Result(), 0).getResult());
+ assertTrue(action.execute(new Result(), 0).isResult());
}
@Test
void unknownFreshnessFailsUnlessUnknownAnswersAreIgnored() {
FakeCatalog.lastUpdated = CatalogAnswer.notFound();
- assertFalse(action().execute(new Result(), 0).getResult());
+ assertFalse(action().execute(new Result(), 0).isResult());
ActionCheckDataCatalog action = action();
action.setUnknownAnswer(CatalogUnknownAnswer.IGNORE);
- assertTrue(action.execute(new Result(), 0).getResult());
+ assertTrue(action.execute(new Result(), 0).isResult());
}
@Test
@@ -252,40 +252,40 @@ class ActionCheckDataCatalogTest {
"a", "No null ids", IAssertionCapability.Outcome.PASSED,
Instant.now()),
new IAssertionCapability.AssertionResult(
"b", null, IAssertionCapability.Outcome.UNKNOWN, null)));
- assertTrue(action().execute(new Result(), 0).getResult());
+ assertTrue(action().execute(new Result(), 0).isResult());
FakeCatalog.assertions =
CatalogAnswer.known(
List.of(
new IAssertionCapability.AssertionResult(
"c", "Volume", IAssertionCapability.Outcome.ERROR,
Instant.now())));
- assertFalse(action().execute(new Result(), 0).getResult());
+ assertFalse(action().execute(new Result(), 0).isResult());
ActionCheckDataCatalog action = action();
action.setCheckAssertions(false);
- assertTrue(action.execute(new Result(), 0).getResult());
+ assertTrue(action.execute(new Result(), 0).isResult());
}
@Test
void anUnreachableCatalogFailsTheCheckOrIsIgnored() {
FakeCatalog.resolved = CatalogAnswer.unknown(Reason.UNREACHABLE,
"connection refused");
Result failed = action().execute(new Result(), 0);
- assertFalse(failed.getResult());
+ assertFalse(failed.isResult());
assertEquals(0, failed.getNrErrors());
ActionCheckDataCatalog action = action();
action.setUnknownAnswer(CatalogUnknownAnswer.IGNORE);
- assertTrue(action.execute(new Result(), 0).getResult());
+ assertTrue(action.execute(new Result(), 0).isResult());
}
@Test
void aCheckTheCatalogTypeDoesNotSupportIsAnUnknownAnswer() {
ActionCheckDataCatalog action =
action("minimal", new CatalogDataset(CatalogDatasetType.CATALOG_ID,
null, null, "urn:x"));
- assertFalse(action.execute(new Result(), 0).getResult());
+ assertFalse(action.execute(new Result(), 0).isResult());
action.setUnknownAnswer(CatalogUnknownAnswer.IGNORE);
- assertTrue(action.execute(new Result(), 0).getResult());
+ assertTrue(action.execute(new Result(), 0).isResult());
}
@Test
@@ -294,7 +294,7 @@ class ActionCheckDataCatalogTest {
action(
"prod", new CatalogDataset(CatalogDatasetType.TABLE, "warehouse",
"public", "orders"));
- assertTrue(action.execute(new Result(), 0).getResult());
+ assertTrue(action.execute(new Result(), 0).isResult());
DatasetRef asked = FakeCatalog.asked.get(0);
assertTrue(asked.namespace().endsWith("://db.example.com:5432"),
asked.namespace());
@@ -304,13 +304,13 @@ class ActionCheckDataCatalogTest {
@Test
void aMissingCatalogOrConnectionIsAnError() {
Result noCatalog = action("not-there").execute(new Result(), 0);
- assertFalse(noCatalog.getResult());
+ assertFalse(noCatalog.isResult());
assertEquals(1, noCatalog.getNrErrors());
Result noConnection =
action("prod", new CatalogDataset(CatalogDatasetType.TABLE, "nowhere",
null, "orders"))
.execute(new Result(), 0);
- assertFalse(noConnection.getResult());
+ assertFalse(noConnection.isResult());
assertEquals(1, noConnection.getNrErrors());
}
@@ -390,7 +390,7 @@ class ActionCheckDataCatalogTest {
Result result = action.execute(new Result(), 0);
- assertFalse(result.getResult());
+ assertFalse(result.isResult());
assertEquals(1, result.getNrErrors());
assertTrue(FakeCatalog.asked.isEmpty());
}
@@ -406,7 +406,7 @@ class ActionCheckDataCatalogTest {
Result result = action.execute(new Result(), 0);
- assertFalse(result.getResult());
+ assertFalse(result.isResult());
assertEquals(0, result.getNrErrors());
assertTrue(FakeCatalog.asked.isEmpty());
}
diff --git
a/plugins/actions/columnsexist/src/test/java/org/apache/hop/workflow/actions/columnsexist/ActionColumnsExistTest.java
b/plugins/actions/columnsexist/src/test/java/org/apache/hop/workflow/actions/columnsexist/ActionColumnsExistTest.java
index 46b854598b..e324549d2a 100644
---
a/plugins/actions/columnsexist/src/test/java/org/apache/hop/workflow/actions/columnsexist/ActionColumnsExistTest.java
+++
b/plugins/actions/columnsexist/src/test/java/org/apache/hop/workflow/actions/columnsexist/ActionColumnsExistTest.java
@@ -84,7 +84,7 @@ class ActionColumnsExistTest {
Result result = action.execute(new Result(), 0);
- assertFalse(result.getResult());
+ assertFalse(result.isResult());
assertEquals(1, result.getNrErrors());
}
@@ -104,7 +104,7 @@ class ActionColumnsExistTest {
Result result = action.execute(new Result(), 0);
- assertFalse(result.getResult());
+ assertFalse(result.isResult());
assertEquals(1, result.getNrErrors());
}
@@ -122,7 +122,7 @@ class ActionColumnsExistTest {
Result result = action.execute(new Result(), 0);
- assertFalse(result.getResult());
+ assertFalse(result.isResult());
assertEquals(1, result.getNrErrors());
}
@@ -141,7 +141,7 @@ class ActionColumnsExistTest {
Result result = action.execute(new Result(), 0);
- assertFalse(result.getResult());
+ assertFalse(result.isResult());
assertEquals(1, result.getNrErrors());
}
@@ -169,7 +169,7 @@ class ActionColumnsExistTest {
Result result = action.execute(new Result(), 0);
- assertTrue(result.getResult());
+ assertTrue(result.isResult());
assertEquals(0, result.getNrErrors());
assertEquals(2, result.getNrLinesWritten());
assertEquals(0, result.getEntryNr());
@@ -196,7 +196,7 @@ class ActionColumnsExistTest {
Result result = action.execute(new Result(), 0);
- assertFalse(result.getResult());
+ assertFalse(result.isResult());
assertEquals(1, result.getNrErrors());
}
@@ -224,7 +224,7 @@ class ActionColumnsExistTest {
Result result = action.execute(new Result(), 0);
- assertFalse(result.getResult());
+ assertFalse(result.isResult());
assertEquals(1, result.getNrErrors());
assertEquals(1, result.getNrLinesWritten());
assertEquals(1, result.getEntryNr());
diff --git
a/plugins/actions/dbt/src/test/java/org/apache/hop/workflow/actions/dbt/ActionDbtExecutionTest.java
b/plugins/actions/dbt/src/test/java/org/apache/hop/workflow/actions/dbt/ActionDbtExecutionTest.java
index 3c4187fea2..e32540db32 100644
---
a/plugins/actions/dbt/src/test/java/org/apache/hop/workflow/actions/dbt/ActionDbtExecutionTest.java
+++
b/plugins/actions/dbt/src/test/java/org/apache/hop/workflow/actions/dbt/ActionDbtExecutionTest.java
@@ -104,7 +104,7 @@ class ActionDbtExecutionTest {
Result result = action.execute(new Result(), 0);
- assertTrue(result.getResult());
+ assertTrue(result.isResult());
assertEquals(0, result.getNrErrors());
}
@@ -119,7 +119,7 @@ class ActionDbtExecutionTest {
Result result = action.execute(new Result(), 0);
- assertFalse(result.getResult());
+ assertFalse(result.isResult());
assertEquals(1, result.getNrErrors());
}
@@ -133,7 +133,7 @@ class ActionDbtExecutionTest {
Result result = action.execute(new Result(), 0);
- assertFalse(result.getResult());
+ assertFalse(result.isResult());
assertFalse(
Files.exists(runResults), "the previous run's artifacts must not
survive into this run");
}
@@ -147,7 +147,7 @@ class ActionDbtExecutionTest {
Result result = action.execute(new Result(), 0);
long elapsedMs = System.currentTimeMillis() - startedAt;
- assertFalse(result.getResult());
+ assertFalse(result.isResult());
assertEquals(1, result.getNrErrors());
assertTrue(
elapsedMs < 30_000, "the action should have been cut short, took " +
elapsedMs + "ms");
@@ -160,6 +160,6 @@ class ActionDbtExecutionTest {
Result result = action.execute(new Result(), 0);
- assertFalse(result.getResult());
+ assertFalse(result.isResult());
}
}
diff --git
a/plugins/actions/deleteexecutioninfo/src/test/java/org/apache/hop/workflow/actions/deleteexecutioninfo/ActionDeleteExecutionInfoTest.java
b/plugins/actions/deleteexecutioninfo/src/test/java/org/apache/hop/workflow/actions/deleteexecutioninfo/ActionDeleteExecutionInfoTest.java
index d90a5a820d..8c8a6dc5a2 100644
---
a/plugins/actions/deleteexecutioninfo/src/test/java/org/apache/hop/workflow/actions/deleteexecutioninfo/ActionDeleteExecutionInfoTest.java
+++
b/plugins/actions/deleteexecutioninfo/src/test/java/org/apache/hop/workflow/actions/deleteexecutioninfo/ActionDeleteExecutionInfoTest.java
@@ -72,7 +72,7 @@ class ActionDeleteExecutionInfoTest {
Result result = action.execute(new Result(), 0);
- assertTrue(result.getResult());
+ assertTrue(result.isResult());
assertEquals(0, result.getNrErrors());
assertEquals(1, result.getNrLinesDeleted());
assertNull(stored.getExecution("old"));
@@ -92,7 +92,7 @@ class ActionDeleteExecutionInfoTest {
Result result = action.execute(new Result(), 0);
- assertTrue(result.getResult());
+ assertTrue(result.isResult());
assertEquals(2, result.getNrLinesDeleted());
assertTrue(stored.getExecutionIds(false, 0).isEmpty());
assertNotNull(provider.getSerializer(ExecutionInfoLocation.class).load("exec-loc"));
diff --git
a/plugins/actions/deletefolders/src/test/java/org/apache/hop/workflow/actions/deletefolders/ActionDeleteFoldersCheckTest.java
b/plugins/actions/deletefolders/src/test/java/org/apache/hop/workflow/actions/deletefolders/ActionDeleteFoldersCheckTest.java
index 65229464e4..14bf9141cd 100644
---
a/plugins/actions/deletefolders/src/test/java/org/apache/hop/workflow/actions/deletefolders/ActionDeleteFoldersCheckTest.java
+++
b/plugins/actions/deletefolders/src/test/java/org/apache/hop/workflow/actions/deletefolders/ActionDeleteFoldersCheckTest.java
@@ -205,7 +205,7 @@ class ActionDeleteFoldersCheckTest {
assertEquals(0, result.getNrErrors());
assertEquals(0, result.getNrLinesDeleted());
- assertTrue(result.getResult());
+ assertTrue(result.isResult());
}
@Test
diff --git
a/plugins/actions/http/src/test/java/org/apache/hop/workflow/actions/http/ActionHttpConnectionTest.java
b/plugins/actions/http/src/test/java/org/apache/hop/workflow/actions/http/ActionHttpConnectionTest.java
index 2e60b57719..528093ec12 100644
---
a/plugins/actions/http/src/test/java/org/apache/hop/workflow/actions/http/ActionHttpConnectionTest.java
+++
b/plugins/actions/http/src/test/java/org/apache/hop/workflow/actions/http/ActionHttpConnectionTest.java
@@ -73,7 +73,7 @@ class ActionHttpConnectionTest {
"/",
exchange -> {
List<String> auth =
exchange.getRequestHeaders().get("Authorization");
- authorization.set(auth == null ? null : auth.get(0));
+ authorization.set(auth == null ? null : auth.getFirst());
requestPath.set(exchange.getRequestURI().getPath());
byte[] body = PAYLOAD.getBytes(UTF_8);
@@ -103,7 +103,7 @@ class ActionHttpConnectionTest {
Result result = action.execute(new Result(), 0);
- assertTrue(result.getResult());
+ assertTrue(result.isResult());
assertEquals("/v1/items", requestPath.get());
assertEquals(PAYLOAD, FileUtils.readFileToString(target, UTF_8));
}
@@ -118,7 +118,7 @@ class ActionHttpConnectionTest {
Result result = action.execute(new Result(), 0);
- assertTrue(result.getResult());
+ assertTrue(result.isResult());
assertEquals(
"Basic " + Base64.getEncoder().encodeToString((USER + ":" +
PASSWORD).getBytes(UTF_8)),
authorization.get());
@@ -136,7 +136,7 @@ class ActionHttpConnectionTest {
Result result = action.execute(new Result(), 0);
- assertTrue(result.getResult());
+ assertTrue(result.isResult());
assertEquals("/elsewhere", requestPath.get());
assertNull(authorization.get(), "the connection credentials went to
another host");
}
@@ -156,7 +156,7 @@ class ActionHttpConnectionTest {
Result result = action.execute(new Result(), 0);
- assertFalse(result.getResult());
+ assertFalse(result.isResult());
assertEquals(1, result.getNrErrors());
}
diff --git
a/plugins/actions/http/src/test/java/org/apache/hop/workflow/actions/http/ActionHttpExecutionTest.java
b/plugins/actions/http/src/test/java/org/apache/hop/workflow/actions/http/ActionHttpExecutionTest.java
index 06e9027073..b01c773c76 100644
---
a/plugins/actions/http/src/test/java/org/apache/hop/workflow/actions/http/ActionHttpExecutionTest.java
+++
b/plugins/actions/http/src/test/java/org/apache/hop/workflow/actions/http/ActionHttpExecutionTest.java
@@ -99,7 +99,7 @@ class ActionHttpExecutionTest {
Result result = http.execute(new Result(), 0);
- assertTrue(result.getResult());
+ assertTrue(result.isResult());
assertEquals(0, result.getNrErrors());
assertFalse(result.getResultFiles().isEmpty());
assertEquals(payload, FileUtils.readFileToString(tempFileForDownload,
UTF_8));
@@ -127,7 +127,7 @@ class ActionHttpExecutionTest {
Result result = http.execute(new Result(), 0);
- assertTrue(result.getResult());
+ assertTrue(result.isResult());
assertEquals(0, result.getNrErrors());
assertEquals(payload, FileUtils.readFileToString(tempFileForDownload,
UTF_8));
}
@@ -145,7 +145,7 @@ class ActionHttpExecutionTest {
Result result = http.execute(new Result(), 0);
- assertFalse(result.getResult());
+ assertFalse(result.isResult());
assertEquals(1, result.getNrErrors());
assertEquals(0, result.getBytesReadThisAction());
assertEquals(0, result.getBytesWrittenThisAction());
@@ -167,7 +167,7 @@ class ActionHttpExecutionTest {
Result result = http.execute(new Result(), 0);
- assertTrue(result.getResult());
+ assertTrue(result.isResult());
assertEquals(0, result.getNrErrors());
assertEquals(payload, FileUtils.readFileToString(tempFileForDownload,
UTF_8));
assertEquals(payload.getBytes(UTF_8).length,
result.getBytesReadThisAction());
@@ -191,7 +191,7 @@ class ActionHttpExecutionTest {
Result result = http.execute(new Result(), 0);
- assertTrue(result.getResult());
+ assertTrue(result.isResult());
assertEquals(0, result.getNrErrors());
assertEquals(payload, FileUtils.readFileToString(tempFileForDownload,
UTF_8));
assertEquals(payload, http.getVariable("HTTP_REPLY"));
@@ -213,7 +213,7 @@ class ActionHttpExecutionTest {
Result result = http.execute(new Result(), 0);
- assertTrue(result.getResult());
+ assertTrue(result.isResult());
assertEquals(0, result.getNrErrors());
assertNull(http.getVariable("HTTP_REPLY"));
assertNull(workflow.getVariable("HTTP_REPLY"));
@@ -232,7 +232,7 @@ class ActionHttpExecutionTest {
Result result = http.execute(new Result(), 0);
- assertFalse(result.getResult());
+ assertFalse(result.isResult());
assertEquals(1, result.getNrErrors());
assertEquals("previous content", Files.readString(target));
assertEquals(List.of(target), filesIn(dir), "no part file is left behind");
@@ -252,7 +252,7 @@ class ActionHttpExecutionTest {
Result result = http.execute(new Result(), 0);
- assertFalse(result.getResult());
+ assertFalse(result.isResult());
assertEquals(1, result.getNrErrors());
assertEquals("previous content", Files.readString(target));
assertEquals(List.of(target), filesIn(dir), "no part file is left behind");
@@ -273,7 +273,7 @@ class ActionHttpExecutionTest {
Result result = http.execute(new Result(), 0);
- assertTrue(result.getResult());
+ assertTrue(result.isResult());
assertEquals(0, result.getNrErrors());
assertEquals("previous content|download only payload",
Files.readString(target));
assertEquals(List.of(target), filesIn(dir), "no part file is left behind");
@@ -294,13 +294,13 @@ class ActionHttpExecutionTest {
Result result = http.execute(new Result(), 0);
- assertFalse(result.getResult());
+ assertFalse(result.isResult());
assertEquals("previous content", Files.readString(target));
assertEquals(List.of(target), filesIn(dir), "no part file is left behind");
}
@Test
- void testHttpMissingTargetFolderFailsBeforeTheRequestIsSent(@TempDir Path
dir) throws Exception {
+ void testHttpMissingTargetFolderFailsBeforeTheRequestIsSent(@TempDir Path
dir) {
int requestsBefore = countedRequests.get();
ActionHttp http = new ActionHttp();
@@ -311,7 +311,7 @@ class ActionHttpExecutionTest {
Result result = http.execute(new Result(), 0);
- assertFalse(result.getResult());
+ assertFalse(result.isResult());
assertEquals(1, result.getNrErrors());
assertEquals(requestsBefore, countedRequests.get(), "the request must not
have been sent");
}
@@ -342,7 +342,7 @@ class ActionHttpExecutionTest {
Result result = http.execute(previousResult, 0);
- assertFalse(result.getResult(), "a failed row must fail the action");
+ assertFalse(result.isResult(), "a failed row must fail the action");
assertEquals(1, result.getNrErrors());
assertEquals("download only payload", Files.readString(first));
assertEquals(List.of(first), filesIn(dir), "a failed row must not create a
target file");
@@ -359,7 +359,7 @@ class ActionHttpExecutionTest {
Result result = http.execute(previousResult, 0);
- assertFalse(result.getResult());
+ assertFalse(result.isResult());
assertEquals(0, result.getNrErrors());
}
diff --git
a/plugins/actions/http/src/test/java/org/apache/hop/workflow/actions/http/ActionHttpProxyTest.java
b/plugins/actions/http/src/test/java/org/apache/hop/workflow/actions/http/ActionHttpProxyTest.java
index 9352ecaac6..5dd5ea3452 100644
---
a/plugins/actions/http/src/test/java/org/apache/hop/workflow/actions/http/ActionHttpProxyTest.java
+++
b/plugins/actions/http/src/test/java/org/apache/hop/workflow/actions/http/ActionHttpProxyTest.java
@@ -92,8 +92,8 @@ class ActionHttpProxyTest {
proxyWasCalled.set(true);
List<String> proxyAuth =
exchange.getRequestHeaders().get("Proxy-Authorization");
List<String> serverAuth =
exchange.getRequestHeaders().get("Authorization");
- proxyAuthorization.set(proxyAuth == null ? null : proxyAuth.get(0));
- serverAuthorization.set(serverAuth == null ? null :
serverAuth.get(0));
+ proxyAuthorization.set(proxyAuth == null ? null :
proxyAuth.getFirst());
+ serverAuthorization.set(serverAuth == null ? null :
serverAuth.getFirst());
if (proxyAuth == null) {
exchange.getResponseHeaders().add("Proxy-Authenticate", "Basic
realm=\"hop-test\"");
@@ -148,7 +148,7 @@ class ActionHttpProxyTest {
Result result = action.execute(new Result(), 0);
- assertTrue(result.getResult());
+ assertTrue(result.isResult());
assertEquals(0, result.getNrErrors());
assertEquals(PROXIED_PAYLOAD, FileUtils.readFileToString(target, UTF_8));
assertEquals(basic(PROXY_USER, PROXY_PASSWORD), proxyAuthorization.get());
@@ -166,7 +166,7 @@ class ActionHttpProxyTest {
Result result = action.execute(new Result(), 0);
- assertFalse(result.getResult());
+ assertFalse(result.isResult());
assertEquals(1, result.getNrErrors());
assertNull(proxyAuthorization.get(), "the server's credentials were sent
to the proxy");
assertNull(serverAuthorization.get(), "the server's credentials were sent
to the proxy");
@@ -185,7 +185,7 @@ class ActionHttpProxyTest {
Result result = action.execute(new Result(), 0);
- assertTrue(result.getResult());
+ assertTrue(result.isResult());
assertEquals(basic(PROXY_USER, PROXY_PASSWORD), proxyAuthorization.get());
// The server never challenged, so its credentials stayed at home.
assertNull(serverAuthorization.get());
@@ -209,7 +209,7 @@ class ActionHttpProxyTest {
Result result = action.execute(new Result(), 0);
- assertTrue(result.getResult());
+ assertTrue(result.isResult());
assertTrue(originWasCalled.get());
assertEquals(ORIGIN_PAYLOAD, FileUtils.readFileToString(target, UTF_8));
assertNull(proxyAuthorization.get(), "the request went through the proxy
after all");
@@ -233,7 +233,7 @@ class ActionHttpProxyTest {
Result result = action.execute(new Result(), 0);
- assertTrue(result.getResult());
+ assertTrue(result.isResult());
assertEquals(PROXIED_PAYLOAD, FileUtils.readFileToString(target, UTF_8));
assertEquals(basic(PROXY_USER, PROXY_PASSWORD), proxyAuthorization.get());
}
@@ -294,7 +294,7 @@ class ActionHttpProxyTest {
.getBuffer(action.getLogChannel().getLogChannelId(), false)
.toString();
- assertTrue(result.getResult());
+ assertTrue(result.isResult());
assertTrue(originWasCalled.get());
assertTrue(log.contains("localhost"), "the URL should still be logged: " +
log);
assertFalse(log.contains("topsecret"), "the password in the URL was
logged: " + log);
diff --git
a/plugins/actions/pgpfiles/src/test/java/org/apache/hop/workflow/actions/pgpencryptfiles/ActionPGPEncryptFilesSignTest.java
b/plugins/actions/pgpfiles/src/test/java/org/apache/hop/workflow/actions/pgpencryptfiles/ActionPGPEncryptFilesSignTest.java
index 3929ca6bd3..5d447176bf 100644
---
a/plugins/actions/pgpfiles/src/test/java/org/apache/hop/workflow/actions/pgpencryptfiles/ActionPGPEncryptFilesSignTest.java
+++
b/plugins/actions/pgpfiles/src/test/java/org/apache/hop/workflow/actions/pgpencryptfiles/ActionPGPEncryptFilesSignTest.java
@@ -159,7 +159,7 @@ class ActionPGPEncryptFilesSignTest {
Result result = sign.execute(new Result(), 0);
assertEquals(0, result.getNrErrors(), "signing must not report errors");
- assertTrue(result.getResult(), "signing must succeed");
+ assertTrue(result.isResult(), "signing must succeed");
assertTrue(Files.exists(signed), "the signed file must be written");
assertTrue(
Files.readString(signed).startsWith("-----BEGIN PGP SIGNED
MESSAGE-----"),
@@ -173,7 +173,7 @@ class ActionPGPEncryptFilesSignTest {
Result verified = verify.execute(new Result(), 0);
assertEquals(0, verified.getNrErrors(), "verifying the signature must not
report errors");
- assertTrue(verified.getResult(), "the signature must verify against the
signing key");
+ assertTrue(verified.isResult(), "the signature must verify against the
signing key");
}
@Test
@@ -192,7 +192,7 @@ class ActionPGPEncryptFilesSignTest {
Result sealedResult = seal.execute(new Result(), 0);
assertEquals(0, sealedResult.getNrErrors(), "sign and encrypt must not
report errors");
- assertTrue(sealedResult.getResult(), "sign and encrypt must succeed");
+ assertTrue(sealedResult.isResult(), "sign and encrypt must succeed");
assertTrue(
Files.readString(sealed).startsWith("-----BEGIN PGP MESSAGE-----"),
"the output must be an encrypted message");
@@ -210,7 +210,7 @@ class ActionPGPEncryptFilesSignTest {
Result openedResult = decrypt.execute(new Result(), 0);
assertEquals(0, openedResult.getNrErrors(), "decrypting must not report
errors");
- assertTrue(openedResult.getResult(), "decrypting must succeed");
+ assertTrue(openedResult.isResult(), "decrypting must succeed");
assertEquals(PLAIN_TEXT, Files.readString(opened), "the round trip must
preserve the content");
}
@@ -252,7 +252,7 @@ class ActionPGPEncryptFilesSignTest {
Result result = action.execute(new Result(), 0);
assertEquals(0, result.getNrErrors(), "signing must not report errors");
- assertTrue(result.getResult(), "signing must succeed");
+ assertTrue(result.isResult(), "signing must succeed");
// Only meaningful while the two differ: were gpg's default the key this
row names, the
// assertion below would hold whether or not the User ID had been promoted
to the signing key.
@@ -300,7 +300,7 @@ class ActionPGPEncryptFilesSignTest {
Result result = seal.execute(new Result(), 0);
assertEquals(0, result.getNrErrors(), "sign and encrypt must not report
errors");
- assertTrue(result.getResult(), "sign and encrypt must succeed");
+ assertTrue(result.isResult(), "sign and encrypt must succeed");
// Decrypting reports the signature as well, so one run shows both halves
of the choice.
String report = gpg("--decrypt", sealed.toString());
@@ -324,7 +324,7 @@ class ActionPGPEncryptFilesSignTest {
Result result = action.execute(new Result(), 0);
assertEquals(0, result.getNrErrors(), "signing with " + localUser + " must
not report errors");
- assertTrue(result.getResult(), "signing with " + localUser + " must
succeed");
+ assertTrue(result.isResult(), "signing with " + localUser + " must
succeed");
return signed;
}
@@ -368,7 +368,7 @@ class ActionPGPEncryptFilesSignTest {
Result result = sign.execute(new Result(), 0);
assertEquals(0, result.getNrErrors(), "signing must not report errors
for: " + name);
- assertTrue(result.getResult(), "signing must succeed for: " + name);
+ assertTrue(result.isResult(), "signing must succeed for: " + name);
assertTrue(Files.exists(signed), "the signed file must be written for: "
+ name);
assertTrue(
Files.readString(signed).startsWith("-----BEGIN PGP SIGNED
MESSAGE-----"),
diff --git
a/plugins/actions/setvariables/src/test/java/org/apache/hop/workflow/actions/setvariables/ActionSetVariablesBlankValueTest.java
b/plugins/actions/setvariables/src/test/java/org/apache/hop/workflow/actions/setvariables/ActionSetVariablesBlankValueTest.java
index 730e155084..527667ac41 100644
---
a/plugins/actions/setvariables/src/test/java/org/apache/hop/workflow/actions/setvariables/ActionSetVariablesBlankValueTest.java
+++
b/plugins/actions/setvariables/src/test/java/org/apache/hop/workflow/actions/setvariables/ActionSetVariablesBlankValueTest.java
@@ -63,7 +63,7 @@ class ActionSetVariablesBlankValueTest {
@Test
void blankValueFromDialogSetsAnEmptyVariable() throws Exception {
ActionSetVariables action = new ActionSetVariables();
- action.setVariableDefinitions(definitions(""));
+ action.setVariableDefinitions(definitions());
assertVariablesAre("", run(action));
}
@@ -77,7 +77,7 @@ class ActionSetVariablesBlankValueTest {
void blankValueSurvivesSaveAndReload() throws Exception {
ActionSetVariables edited = new ActionSetVariables();
edited.setName("set");
- edited.setVariableDefinitions(definitions(""));
+ edited.setVariableDefinitions(definitions());
ActionSetVariables reloaded = loadAction("<action>" + edited.getXml() +
"</action>");
@@ -89,10 +89,10 @@ class ActionSetVariablesBlankValueTest {
assertVariablesAre("new",
run(loadAction(actionXml("<variable_value>new</variable_value>"))));
}
- private static List<VariableDefinition> definitions(String value) {
+ private static List<VariableDefinition> definitions() {
return List.of(
- new VariableDefinition(WORKFLOW_VAR, value,
VariableType.CURRENT_WORKFLOW),
- new VariableDefinition(JVM_VAR, value, VariableType.JVM));
+ new VariableDefinition(WORKFLOW_VAR, "",
VariableType.CURRENT_WORKFLOW),
+ new VariableDefinition(JVM_VAR, "", VariableType.JVM));
}
private static String actionXml(String valueXml) {
@@ -130,7 +130,7 @@ class ActionSetVariablesBlankValueTest {
Result result = action.execute(new Result(), 0);
- assertTrue(result.getResult());
+ assertTrue(result.isResult());
return workflow;
}
diff --git
a/plugins/actions/tableexists/src/test/java/org/apache/hop/workflow/actions/tableexists/ActionTableExistsTest.java
b/plugins/actions/tableexists/src/test/java/org/apache/hop/workflow/actions/tableexists/ActionTableExistsTest.java
index 7c2eb2ef71..830dcbafc4 100644
---
a/plugins/actions/tableexists/src/test/java/org/apache/hop/workflow/actions/tableexists/ActionTableExistsTest.java
+++
b/plugins/actions/tableexists/src/test/java/org/apache/hop/workflow/actions/tableexists/ActionTableExistsTest.java
@@ -59,7 +59,7 @@ class ActionTableExistsTest {
Result result = action.execute(new Result(), 0);
- assertFalse(result.getResult());
+ assertFalse(result.isResult());
assertEquals(1, result.getNrErrors());
verify(action).logError(contains("No database connection is defined"));
}
@@ -80,7 +80,7 @@ class ActionTableExistsTest {
Result result = action.execute(new Result(), 0);
- assertFalse(result.getResult());
+ assertFalse(result.isResult());
assertEquals(1, result.getNrErrors());
verify(action).logError(contains("mysql-does-not-exist"));
}
@@ -107,7 +107,7 @@ class ActionTableExistsTest {
when(db.checkTableExists(any(),
eq("present_table"))).thenReturn(true))) {
Result result = action.execute(new Result(), 0);
- assertTrue(result.getResult());
+ assertTrue(result.isResult());
assertEquals(0, result.getNrErrors());
assertEquals(1, databases.constructed().size());
}
@@ -135,7 +135,7 @@ class ActionTableExistsTest {
when(db.checkTableExists(any(),
eq("missing_table"))).thenReturn(false))) {
Result result = action.execute(new Result(), 0);
- assertFalse(result.getResult());
+ assertFalse(result.isResult());
assertEquals(0, result.getNrErrors());
assertEquals(1, databases.constructed().size());
}
diff --git
a/plugins/actions/truncatetables/src/test/java/org/apache/hop/workflow/actions/truncatetables/ActionTruncateTablesTest.java
b/plugins/actions/truncatetables/src/test/java/org/apache/hop/workflow/actions/truncatetables/ActionTruncateTablesTest.java
index 6f2e798bac..eff7fc634e 100644
---
a/plugins/actions/truncatetables/src/test/java/org/apache/hop/workflow/actions/truncatetables/ActionTruncateTablesTest.java
+++
b/plugins/actions/truncatetables/src/test/java/org/apache/hop/workflow/actions/truncatetables/ActionTruncateTablesTest.java
@@ -63,7 +63,7 @@ class ActionTruncateTablesTest {
Result result = action.execute(new Result(), 0);
- assertFalse(result.getResult());
+ assertFalse(result.isResult());
assertEquals(1, result.getNrErrors());
}
@@ -84,7 +84,7 @@ class ActionTruncateTablesTest {
Result result = action.execute(new Result(), 0);
- assertFalse(result.getResult());
+ assertFalse(result.isResult());
assertEquals(1, result.getNrErrors());
verify(action).logError(contains("non-existent-db"));
}
@@ -96,7 +96,7 @@ class ActionTruncateTablesTest {
Result result = action.execute(new Result(), 0);
- assertFalse(result.getResult());
+ assertFalse(result.isResult());
assertEquals(1, result.getNrErrors());
verify(action).logError(contains("No database connection is defined"));
}
@@ -119,7 +119,7 @@ class ActionTruncateTablesTest {
Result result = action.execute(new Result(), 0);
- assertFalse(result.getResult());
+ assertFalse(result.isResult());
assertEquals(1, result.getNrErrors());
verify(action).logError(contains("Unable to load connection corrupt-db
from metadata"));
}
@@ -151,11 +151,11 @@ class ActionTruncateTablesTest {
when(db.checkTableExists(any(),
eq("valid_table"))).thenReturn(true))) {
Result result = action.execute(new Result(), 0);
- assertFalse(result.getResult());
+ assertFalse(result.isResult());
assertEquals(1, result.getNrErrors());
assertEquals(1, result.getNrLinesDeleted());
verify(action).logError(contains("empty"));
- verify(databases.constructed().get(0)).truncateTable("valid_table");
+ verify(databases.constructed().getFirst()).truncateTable("valid_table");
}
}
@@ -190,11 +190,11 @@ class ActionTruncateTablesTest {
when(db.checkTableExists(any(),
eq("valid_table"))).thenReturn(true))) {
Result result = action.execute(previous, 0);
- assertFalse(result.getResult());
+ assertFalse(result.isResult());
assertEquals(1, result.getNrErrors());
assertEquals(1, result.getNrLinesDeleted());
verify(action).logError(contains("empty"));
- verify(databases.constructed().get(0)).truncateTable("valid_table");
+ verify(databases.constructed().getFirst()).truncateTable("valid_table");
}
}
@@ -212,7 +212,8 @@ class ActionTruncateTablesTest {
action.check(remarks, workflowMeta, variables, null);
assertFalse(remarks.isEmpty());
- assertEquals(org.apache.hop.core.ICheckResult.TYPE_RESULT_WARNING,
remarks.get(0).getType());
+ assertEquals(
+ org.apache.hop.core.ICheckResult.TYPE_RESULT_WARNING,
remarks.getFirst().getType());
}
@Test
@@ -227,6 +228,7 @@ class ActionTruncateTablesTest {
action.check(remarks, workflowMeta, new
org.apache.hop.core.variables.Variables(), null);
assertFalse(remarks.isEmpty());
- assertEquals(org.apache.hop.core.ICheckResult.TYPE_RESULT_WARNING,
remarks.get(0).getType());
+ assertEquals(
+ org.apache.hop.core.ICheckResult.TYPE_RESULT_WARNING,
remarks.getFirst().getType());
}
}
diff --git
a/plugins/actions/unzip/src/test/java/org/apache/hop/workflow/actions/unzip/WorkflowActionUnZipTest.java
b/plugins/actions/unzip/src/test/java/org/apache/hop/workflow/actions/unzip/WorkflowActionUnZipTest.java
index 90416f6d2d..90b4115e79 100644
---
a/plugins/actions/unzip/src/test/java/org/apache/hop/workflow/actions/unzip/WorkflowActionUnZipTest.java
+++
b/plugins/actions/unzip/src/test/java/org/apache/hop/workflow/actions/unzip/WorkflowActionUnZipTest.java
@@ -241,7 +241,7 @@ class WorkflowActionUnZipTest extends
WorkflowActionLoadSaveTestSupport<ActionUn
Result result = runUnzipSingleFile(action, zipFile, targetDir,
FileExistsEnum.OVERWRITE);
assertEquals(0, result.getNrErrors(), "The action should not report
errors");
- assertTrue(result.getResult(), "The action should succeed");
+ assertTrue(result.isResult(), "The action should succeed");
assertEquals(
entryCount,
countFiles(targetDir),
diff --git
a/plugins/actions/waitforsql/src/test/java/org/apache/hop/workflow/actions/waitforsql/ActionWaitForSqlTest.java
b/plugins/actions/waitforsql/src/test/java/org/apache/hop/workflow/actions/waitforsql/ActionWaitForSqlTest.java
index 86d05c8043..53ad0e31d2 100644
---
a/plugins/actions/waitforsql/src/test/java/org/apache/hop/workflow/actions/waitforsql/ActionWaitForSqlTest.java
+++
b/plugins/actions/waitforsql/src/test/java/org/apache/hop/workflow/actions/waitforsql/ActionWaitForSqlTest.java
@@ -154,7 +154,7 @@ class ActionWaitForSqlTest {
Result result = action.execute(new Result(), 0);
- assertFalse(result.getResult());
+ assertFalse(result.isResult());
assertEquals(1, result.getNrErrors());
verify(action).logError(contains("Exception while waiting for SQL data"));
verify(action, never()).logBasic(contains("Exception while waiting for SQL
data"));
diff --git
a/plugins/databases/mssqlnative/src/test/java/org/apache/hop/workflow/actions/mssqlbulkload/ActionMssqlBulkLoadExecuteTest.java
b/plugins/databases/mssqlnative/src/test/java/org/apache/hop/workflow/actions/mssqlbulkload/ActionMssqlBulkLoadExecuteTest.java
index 756c348755..db4419c59c 100644
---
a/plugins/databases/mssqlnative/src/test/java/org/apache/hop/workflow/actions/mssqlbulkload/ActionMssqlBulkLoadExecuteTest.java
+++
b/plugins/databases/mssqlnative/src/test/java/org/apache/hop/workflow/actions/mssqlbulkload/ActionMssqlBulkLoadExecuteTest.java
@@ -190,10 +190,10 @@ class ActionMssqlBulkLoadExecuteTest {
try (MockedConstruction<Database> databases = mockDatabases()) {
Result result = action.execute(new Result(), 0);
- assertTrue(result.getResult());
+ assertTrue(result.isResult());
assertEquals(0, result.getNrErrors());
ArgumentCaptor<String> sql = ArgumentCaptor.forClass(String.class);
- verify(databases.constructed().get(0)).execStatement(sql.capture());
+ verify(databases.constructed().getFirst()).execStatement(sql.capture());
return sql.getValue();
}
}
@@ -202,7 +202,7 @@ class ActionMssqlBulkLoadExecuteTest {
try (MockedConstruction<Database> databases = mockDatabases()) {
Result result = action.execute(new Result(), 0);
- assertFalse(result.getResult());
+ assertFalse(result.isResult());
assertEquals(1, result.getNrErrors());
for (Database db : databases.constructed()) {
verify(db, never()).execStatement(anyString());
diff --git
a/plugins/databases/mysql/src/test/java/org/apache/hop/workflow/actions/mysqlbulkfile/ActionMysqlBulkFileBlankFieldsTest.java
b/plugins/databases/mysql/src/test/java/org/apache/hop/workflow/actions/mysqlbulkfile/ActionMysqlBulkFileBlankFieldsTest.java
index f246f607c0..b4237b6217 100644
---
a/plugins/databases/mysql/src/test/java/org/apache/hop/workflow/actions/mysqlbulkfile/ActionMysqlBulkFileBlankFieldsTest.java
+++
b/plugins/databases/mysql/src/test/java/org/apache/hop/workflow/actions/mysqlbulkfile/ActionMysqlBulkFileBlankFieldsTest.java
@@ -152,8 +152,8 @@ class ActionMysqlBulkFileBlankFieldsTest {
assertEquals(1, databases.constructed().size());
ArgumentCaptor<String> sql = ArgumentCaptor.forClass(String.class);
- verify(databases.constructed().get(0)).prepareSql(sql.capture());
- assertTrue(result.getResult());
+ verify(databases.constructed().getFirst()).prepareSql(sql.capture());
+ assertTrue(result.isResult());
return sql.getValue();
}
}
diff --git
a/plugins/databases/mysql/src/test/java/org/apache/hop/workflow/actions/mysqlbulkfile/ActionMysqlBulkFileExecuteTest.java
b/plugins/databases/mysql/src/test/java/org/apache/hop/workflow/actions/mysqlbulkfile/ActionMysqlBulkFileExecuteTest.java
index a753ad026b..f55c5e0373 100644
---
a/plugins/databases/mysql/src/test/java/org/apache/hop/workflow/actions/mysqlbulkfile/ActionMysqlBulkFileExecuteTest.java
+++
b/plugins/databases/mysql/src/test/java/org/apache/hop/workflow/actions/mysqlbulkfile/ActionMysqlBulkFileExecuteTest.java
@@ -97,7 +97,7 @@ class ActionMysqlBulkFileExecuteTest {
try (MockedConstruction<Database> databases =
mockConstruction(Database.class)) {
Result result = action.execute(new Result(), 0);
- assertFalse(result.getResult());
+ assertFalse(result.isResult());
assertEquals(1, result.getNrErrors());
assertTrue(databases.constructed().isEmpty());
}
@@ -112,7 +112,7 @@ class ActionMysqlBulkFileExecuteTest {
try (MockedConstruction<Database> databases =
mockConstruction(Database.class)) {
Result result = action.execute(new Result(), 0);
- assertTrue(result.getResult());
+ assertTrue(result.isResult());
assertEquals(0, result.getNrErrors());
assertTrue(databases.constructed().isEmpty());
}
@@ -128,7 +128,7 @@ class ActionMysqlBulkFileExecuteTest {
Result result = action.execute(new Result(), 0);
- assertFalse(result.getResult());
+ assertFalse(result.isResult());
assertEquals(1, result.getNrErrors());
}
@@ -141,7 +141,7 @@ class ActionMysqlBulkFileExecuteTest {
Result result = action.execute(new Result(), 0);
- assertFalse(result.getResult());
+ assertFalse(result.isResult());
assertEquals(1, result.getNrErrors());
verify(workflowMeta, never()).findDatabase(anyString(), any());
}
@@ -182,9 +182,9 @@ class ActionMysqlBulkFileExecuteTest {
})) {
Result result = action.execute(new Result(), 0);
- assertTrue(result.getResult());
+ assertTrue(result.isResult());
ArgumentCaptor<String> sql = ArgumentCaptor.forClass(String.class);
- verify(databases.constructed().get(0)).prepareSql(sql.capture());
+ verify(databases.constructed().getFirst()).prepareSql(sql.capture());
return sql.getValue();
}
}
diff --git
a/plugins/databases/mysql/src/test/java/org/apache/hop/workflow/actions/mysqlbulkload/ActionMysqlBulkLoadBlankFieldsTest.java
b/plugins/databases/mysql/src/test/java/org/apache/hop/workflow/actions/mysqlbulkload/ActionMysqlBulkLoadBlankFieldsTest.java
index d95d3a3cbd..1d3c40310a 100644
---
a/plugins/databases/mysql/src/test/java/org/apache/hop/workflow/actions/mysqlbulkload/ActionMysqlBulkLoadBlankFieldsTest.java
+++
b/plugins/databases/mysql/src/test/java/org/apache/hop/workflow/actions/mysqlbulkload/ActionMysqlBulkLoadBlankFieldsTest.java
@@ -149,8 +149,8 @@ class ActionMysqlBulkLoadBlankFieldsTest {
assertEquals(1, databases.constructed().size());
ArgumentCaptor<String> sql = ArgumentCaptor.forClass(String.class);
- verify(databases.constructed().get(0)).execStatement(sql.capture());
- assertTrue(result.getResult());
+ verify(databases.constructed().getFirst()).execStatement(sql.capture());
+ assertTrue(result.isResult());
return sql.getValue();
}
}
diff --git
a/plugins/databases/mysql/src/test/java/org/apache/hop/workflow/actions/mysqlbulkload/ActionMysqlBulkLoadUnknownConnectionTest.java
b/plugins/databases/mysql/src/test/java/org/apache/hop/workflow/actions/mysqlbulkload/ActionMysqlBulkLoadUnknownConnectionTest.java
index fe580393f6..1dd663846c 100644
---
a/plugins/databases/mysql/src/test/java/org/apache/hop/workflow/actions/mysqlbulkload/ActionMysqlBulkLoadUnknownConnectionTest.java
+++
b/plugins/databases/mysql/src/test/java/org/apache/hop/workflow/actions/mysqlbulkload/ActionMysqlBulkLoadUnknownConnectionTest.java
@@ -62,7 +62,7 @@ class ActionMysqlBulkLoadUnknownConnectionTest {
try (MockedConstruction<Database> databases =
mockConstruction(Database.class)) {
Result result = action.execute(new Result(), 0);
- assertFalse(result.getResult());
+ assertFalse(result.isResult());
assertEquals(1, result.getNrErrors());
assertTrue(databases.constructed().isEmpty());
}
@@ -78,9 +78,9 @@ class ActionMysqlBulkLoadUnknownConnectionTest {
action.getResourceDependencies(new Variables(), workflowMeta);
assertEquals(1, references.size());
- List<ResourceEntry> entries = references.get(0).getEntries();
+ List<ResourceEntry> entries = references.getFirst().getEntries();
assertEquals(1, entries.size());
- assertEquals(ResourceType.FILE, entries.get(0).getResourcetype());
+ assertEquals(ResourceType.FILE, entries.getFirst().getResourcetype());
}
private ActionMysqlBulkLoad newAction() throws Exception {
diff --git
a/plugins/engines/replay/src/main/java/org/apache/hop/replay/workflow/WorkflowReplayGateAfterActionXp.java
b/plugins/engines/replay/src/main/java/org/apache/hop/replay/workflow/WorkflowReplayGateAfterActionXp.java
index b3523fb622..c83d71e875 100644
---
a/plugins/engines/replay/src/main/java/org/apache/hop/replay/workflow/WorkflowReplayGateAfterActionXp.java
+++
b/plugins/engines/replay/src/main/java/org/apache/hop/replay/workflow/WorkflowReplayGateAfterActionXp.java
@@ -76,7 +76,7 @@ public class WorkflowReplayGateAfterActionXp
Result result = extension.actionExecutionResult;
boolean success =
result != null
- && result.getResult()
+ && result.isResult()
&& result.getNrErrors() == 0
&& !result.isStopped()
&& !workflow.isStopped();
@@ -97,7 +97,7 @@ public class WorkflowReplayGateAfterActionXp
manifest.setConfigurationHash(ReplayGateIdentity.configurationHash(workflow,
actionMeta));
manifest.setVariables(changedVariables);
manifest.setElapsedTimeMillis(result.getElapsedTimeMillis());
- manifest.setResult(result.getResult());
+ manifest.setResult(result.isResult());
manifest.setNrErrors(result.getNrErrors());
manifest.setNrLinesInput(result.getNrLinesInput());
manifest.setNrLinesOutput(result.getNrLinesOutput());
diff --git
a/plugins/engines/replay/src/test/java/org/apache/hop/replay/WorkflowReplayGateXpTest.java
b/plugins/engines/replay/src/test/java/org/apache/hop/replay/WorkflowReplayGateXpTest.java
index 5a5131f9e0..0c8efbbb8f 100644
---
a/plugins/engines/replay/src/test/java/org/apache/hop/replay/WorkflowReplayGateXpTest.java
+++
b/plugins/engines/replay/src/test/java/org/apache/hop/replay/WorkflowReplayGateXpTest.java
@@ -121,7 +121,7 @@ class WorkflowReplayGateXpTest {
assertFalse(beforeExt.executeAction);
assertNotNull(beforeExt.result);
- assertTrue(beforeExt.result.getResult());
+ assertTrue(beforeExt.result.isResult());
assertEquals(42L, beforeExt.result.getNrLinesOutput());
assertEquals(1, beforeExt.result.getResultFiles().size());
assertEquals("yes", replay.getVariable("LOADED"));
diff --git
a/plugins/misc/lint/src/test/java/org/apache/hop/lint/ActionRunLinterTest.java
b/plugins/misc/lint/src/test/java/org/apache/hop/lint/ActionRunLinterTest.java
index 8578adbfe9..0689610339 100644
---
a/plugins/misc/lint/src/test/java/org/apache/hop/lint/ActionRunLinterTest.java
+++
b/plugins/misc/lint/src/test/java/org/apache/hop/lint/ActionRunLinterTest.java
@@ -49,7 +49,7 @@ import picocli.CommandLine;
*
* @see <a href="https://github.com/apache/hop/issues/8826">#8826</a>
*/
-public class ActionRunLinterTest {
+class ActionRunLinterTest {
@TempDir private Path dir;
@@ -142,7 +142,7 @@ public class ActionRunLinterTest {
assertEquals(2, cli.get("summary").get("warnings").asInt(),
cli.toString());
assertEquals(1, exitCode);
- assertFalse(result.getResult(), "hop lint exits 1, so the action fails");
+ assertFalse(result.isResult(), "hop lint exits 1, so the action fails");
assertEquals(0, result.getNrErrors(), "failing on findings is not an error
in the action");
}
@@ -169,7 +169,7 @@ public class ActionRunLinterTest {
ActionRunLinter action = action(project);
action.setBaselineFile(baseline.toString());
action.setFailOn(LintSeverity.FailOn.WARNING);
- assertTrue(action.execute(new Result(), 0).getResult());
+ assertTrue(action.execute(new Result(), 0).isResult());
}
@Test
@@ -181,7 +181,7 @@ public class ActionRunLinterTest {
Result result = action.execute(new Result(), 0);
assertEquals(0, exitCode);
- assertTrue(result.getResult());
+ assertTrue(result.isResult());
}
@Test
@@ -190,14 +190,14 @@ public class ActionRunLinterTest {
action.setFailOn(LintSeverity.FailOn.NONE);
action.setMaxWarnings("1");
- assertFalse(action.execute(new Result(), 0).getResult());
+ assertFalse(action.execute(new Result(), 0).isResult());
assertEquals(
1,
hopLint(
new StringBuilder(), "--fail-on", "NONE", "--max-warnings", "1",
project.toString()));
action.setMaxWarnings("2");
- assertTrue(action.execute(new Result(), 0).getResult());
+ assertTrue(action.execute(new Result(), 0).isResult());
assertEquals(
0,
hopLint(
@@ -215,7 +215,7 @@ public class ActionRunLinterTest {
action.setBaselineFile(baseline.toString());
Result result = action.execute(new Result(), 0);
- assertTrue(result.getResult(), "every finding is accepted");
+ assertTrue(result.isResult(), "every finding is accepted");
assertTrue(result.getRows().isEmpty(), result.getRows().toString());
assertEquals("0", action.getVariable(ActionRunLinter.VAR_ERRORS));
}
@@ -227,7 +227,7 @@ public class ActionRunLinterTest {
Result result = action.execute(new Result(), 0);
- assertFalse(result.getResult());
+ assertFalse(result.isResult());
assertEquals(1, result.getNrErrors());
}
@@ -257,7 +257,13 @@ public class ActionRunLinterTest {
assertEquals("2.1.0", sarif.get("version").asText(), sarif.toString());
assertEquals(1, result.getResultFilesList().size());
assertTrue(
-
result.getResultFilesList().get(0).getFile().getName().getPath().endsWith("report.sarif"));
+ result
+ .getResultFilesList()
+ .getFirst()
+ .getFile()
+ .getName()
+ .getPath()
+ .endsWith("report.sarif"));
}
/** The minimum severity narrows the rows and the report, never the outcome
or the counts. */
@@ -270,7 +276,7 @@ public class ActionRunLinterTest {
assertEquals(List.of("ERROR"), column(result, "severity"));
assertEquals("2", action.getVariable(ActionRunLinter.VAR_WARNINGS));
- assertFalse(result.getResult());
+ assertFalse(result.isResult());
}
@Test
@@ -312,7 +318,7 @@ public class ActionRunLinterTest {
Result result = action.execute(new Result(), 0);
assertEquals(0, result.getNrErrors());
- assertTrue(result.getResult());
+ assertTrue(result.isResult());
assertTrue(Files.exists(report), report.toString());
}
@@ -361,7 +367,7 @@ public class ActionRunLinterTest {
try {
ActionRunLinter action = action(project);
Result result = action.execute(new Result(), 0);
- assertFalse(result.getResult());
+ assertFalse(result.isResult());
assertEquals("1", action.getVariable(ActionRunLinter.VAR_ERRORS));
assertEquals(1, cliErrors("--fail-on", "NONE", project.toString()));
@@ -392,7 +398,7 @@ public class ActionRunLinterTest {
Result result = action.execute(new Result(), 0);
- assertFalse(result.getResult());
+ assertFalse(result.isResult());
assertEquals(1, result.getNrErrors());
}
@@ -403,7 +409,7 @@ public class ActionRunLinterTest {
Result result = action.execute(new Result(), 0);
- assertFalse(result.getResult());
+ assertFalse(result.isResult());
assertEquals(1, result.getNrErrors());
}
@@ -442,7 +448,7 @@ public class ActionRunLinterTest {
ActionRunLinter action = action(clean);
action.setFailOn(LintSeverity.FailOn.NONE);
Result result = action.execute(new Result(), 0);
- assertFalse(result.getResult());
+ assertFalse(result.isResult());
assertEquals(1, result.getNrErrors());
StringBuilder err = new StringBuilder();
diff --git
a/plugins/misc/mail/src/test/java/org/apache/hop/mail/workflow/actions/mail/WorkflowEntryTest.java
b/plugins/misc/mail/src/test/java/org/apache/hop/mail/workflow/actions/mail/WorkflowEntryTest.java
index 615935ec5c..fec6d0b83a 100644
---
a/plugins/misc/mail/src/test/java/org/apache/hop/mail/workflow/actions/mail/WorkflowEntryTest.java
+++
b/plugins/misc/mail/src/test/java/org/apache/hop/mail/workflow/actions/mail/WorkflowEntryTest.java
@@ -69,7 +69,7 @@ class WorkflowEntryTest {
jem.setMetadataProvider(new MemoryMetadataProvider());
jem.setConnectionName("does-not-exist");
Result result = jem.execute(new Result(), 0);
- assertFalse(result.getResult());
+ assertFalse(result.isResult());
assertEquals(1, result.getNrErrors());
}
}
diff --git
a/plugins/tech/databricks/src/test/java/org/apache/hop/workflow/actions/databricks/ActionDatabricksJobRunTest.java
b/plugins/tech/databricks/src/test/java/org/apache/hop/workflow/actions/databricks/ActionDatabricksJobRunTest.java
index 5c777f450b..813d948626 100644
---
a/plugins/tech/databricks/src/test/java/org/apache/hop/workflow/actions/databricks/ActionDatabricksJobRunTest.java
+++
b/plugins/tech/databricks/src/test/java/org/apache/hop/workflow/actions/databricks/ActionDatabricksJobRunTest.java
@@ -78,7 +78,7 @@ class ActionDatabricksJobRunTest {
Result result = new Result();
action.execute(result, 0);
assertEquals(1, result.getNrErrors());
- assertFalse(result.getResult());
+ assertFalse(result.isResult());
}
@Test
@@ -107,7 +107,7 @@ class ActionDatabricksJobRunTest {
Result result = new Result();
action.execute(result, 0);
- assertTrue(result.getResult());
+ assertTrue(result.isResult());
assertEquals(0, result.getNrErrors());
assertEquals("12", action.getVariable("DatabricksJobId"));
assertEquals("100", action.getVariable("DatabricksRunId"));
@@ -130,7 +130,7 @@ class ActionDatabricksJobRunTest {
Result result = new Result();
action.execute(result, 0);
- assertTrue(result.getResult());
+ assertTrue(result.isResult());
assertEquals("5", action.getVariable("DatabricksRunId"));
verify(client, never()).getRun(anyLong());
}
@@ -155,7 +155,7 @@ class ActionDatabricksJobRunTest {
Result result = new Result();
action.execute(result, 0);
- assertTrue(result.getResult());
+ assertTrue(result.isResult());
verify(client).submitRun("{\"tasks\":[]}");
}
@@ -168,7 +168,7 @@ class ActionDatabricksJobRunTest {
action.setClientFactory((c, v) -> client);
Result r = new Result();
action.execute(r, 0);
- assertFalse(r.getResult());
+ assertFalse(r.isResult());
assertEquals(1, r.getNrErrors());
}
@@ -191,7 +191,7 @@ class ActionDatabricksJobRunTest {
Result result = new Result();
action.execute(result, 0);
- assertFalse(result.getResult());
+ assertFalse(result.isResult());
assertEquals(1, result.getNrErrors());
assertEquals("FAILED", action.getVariable("DatabricksStatus"));
assertNotNull(action.getVariable("DatabricksError"));
diff --git
a/plugins/tech/databricks/src/test/java/org/apache/hop/workflow/actions/databricks/ActionDatabricksJobWaitTest.java
b/plugins/tech/databricks/src/test/java/org/apache/hop/workflow/actions/databricks/ActionDatabricksJobWaitTest.java
index 836a963c59..ac994c89a7 100644
---
a/plugins/tech/databricks/src/test/java/org/apache/hop/workflow/actions/databricks/ActionDatabricksJobWaitTest.java
+++
b/plugins/tech/databricks/src/test/java/org/apache/hop/workflow/actions/databricks/ActionDatabricksJobWaitTest.java
@@ -71,7 +71,7 @@ class ActionDatabricksJobWaitTest {
Result result = new Result();
action.execute(result, 0);
- assertTrue(result.getResult());
+ assertTrue(result.isResult());
assertEquals("SUCCESS", action.getVariable("DatabricksStatus"));
assertEquals("55", action.getVariable("DatabricksRunId"));
}
@@ -86,7 +86,7 @@ class ActionDatabricksJobWaitTest {
Result result = new Result();
action.execute(result, 0);
- assertFalse(result.getResult());
+ assertFalse(result.isResult());
assertEquals(1, result.getNrErrors());
}
@@ -105,7 +105,7 @@ class ActionDatabricksJobWaitTest {
Result result = new Result();
action.execute(result, 0);
- assertFalse(result.getResult());
+ assertFalse(result.isResult());
assertEquals("FAILED", action.getVariable("DatabricksStatus"));
}
@@ -129,7 +129,7 @@ class ActionDatabricksJobWaitTest {
Result result = new Result();
action.execute(result, 0);
- assertFalse(result.getResult());
+ assertFalse(result.isResult());
assertEquals(1, result.getNrErrors());
assertEquals("CANCELED", action.getVariable("DatabricksStatus"));
String error = action.getVariable("DatabricksError");
diff --git
a/plugins/tech/neo4j/src/main/java/org/apache/hop/neo4j/actions/cypherscript/CypherScript.java
b/plugins/tech/neo4j/src/main/java/org/apache/hop/neo4j/actions/cypherscript/CypherScript.java
index 1b48ee14ba..5975aef070 100644
---
a/plugins/tech/neo4j/src/main/java/org/apache/hop/neo4j/actions/cypherscript/CypherScript.java
+++
b/plugins/tech/neo4j/src/main/java/org/apache/hop/neo4j/actions/cypherscript/CypherScript.java
@@ -96,7 +96,7 @@ public class CypherScript extends ActionBase implements
IAction {
nrExecuted = 0;
}
- if (result.getResult()) {
+ if (result.isResult()) {
if (isBasic()) {
logBasic("Neo4j script executed " + nrExecuted + " statements without
error");
}
@@ -148,7 +148,7 @@ public class CypherScript extends ActionBase implements
IAction {
* also when closing the connection fails after a failed statement.
*/
private static void fail(Result result) {
- if (result.getResult()) {
+ if (result.isResult()) {
result.setResult(false);
result.increaseErrors(1L);
}
diff --git
a/plugins/tech/neo4j/src/test/java/org/apache/hop/neo4j/actions/GraphActionFailuresTest.java
b/plugins/tech/neo4j/src/test/java/org/apache/hop/neo4j/actions/GraphActionFailuresTest.java
index 425697e2cf..1b9a33042c 100644
---
a/plugins/tech/neo4j/src/test/java/org/apache/hop/neo4j/actions/GraphActionFailuresTest.java
+++
b/plugins/tech/neo4j/src/test/java/org/apache/hop/neo4j/actions/GraphActionFailuresTest.java
@@ -112,8 +112,8 @@ class GraphActionFailuresTest {
/** The accepting database runs valid updates, so the failures above come
from the validation. */
@Test
void acceptingDatabaseRunsValidUpdates() throws Exception {
- assertTrue(index(ACCEPTING, rangeIndex()).execute(new Result(),
0).getResult());
- assertTrue(constraint(ACCEPTING, uniqueConstraint()).execute(new Result(),
0).getResult());
+ assertTrue(index(ACCEPTING, rangeIndex()).execute(new Result(),
0).isResult());
+ assertTrue(constraint(ACCEPTING, uniqueConstraint()).execute(new Result(),
0).isResult());
assertEquals(2, statements.size(), statements.toString());
}
@@ -141,7 +141,7 @@ class GraphActionFailuresTest {
private static void assertFalseWithOneError(ActionBase action) throws
HopException {
Result result = action.execute(new Result(), 0);
- assertFalse(result.getResult(), action.getName() + " is true");
+ assertFalse(result.isResult(), action.getName() + " is true");
assertEquals(1, result.getNrErrors(), action.getName());
}
@@ -149,7 +149,7 @@ class GraphActionFailuresTest {
Result previous = new Result();
previous.setNrErrors(2);
Result result = action.execute(previous, 0);
- assertFalse(result.getResult(), action.getName() + " is true");
+ assertFalse(result.isResult(), action.getName() + " is true");
assertEquals(3, result.getNrErrors(), action.getName());
}
diff --git
a/plugins/tech/neo4j/src/test/java/org/apache/hop/neo4j/actions/cypherscript/CypherScriptTransactionTest.java
b/plugins/tech/neo4j/src/test/java/org/apache/hop/neo4j/actions/cypherscript/CypherScriptTransactionTest.java
index 03000df0d7..16d86b3f22 100644
---
a/plugins/tech/neo4j/src/test/java/org/apache/hop/neo4j/actions/cypherscript/CypherScriptTransactionTest.java
+++
b/plugins/tech/neo4j/src/test/java/org/apache/hop/neo4j/actions/cypherscript/CypherScriptTransactionTest.java
@@ -63,7 +63,7 @@ class CypherScriptTransactionTest {
Result result = action.execute(new Result(), 0);
- assertFalse(result.getResult());
+ assertFalse(result.isResult());
assertEquals(1, result.getNrErrors());
assertEquals(List.of("CREATE (:A)", "FAIL"), database.executed);
assertTrue(database.rolledBack, "The transaction was not rolled back");
@@ -85,7 +85,7 @@ class CypherScriptTransactionTest {
Result result = action.execute(new Result(), 0);
- assertTrue(result.getResult());
+ assertTrue(result.isResult());
assertEquals(0, result.getNrErrors());
assertEquals(List.of("CREATE (:A)", "CREATE (:B)"), database.executed);
assertTrue(database.committed);
@@ -99,7 +99,7 @@ class CypherScriptTransactionTest {
Result result = action.execute(new Result(), 0);
- assertTrue(result.getResult());
+ assertTrue(result.isResult());
assertEquals(0, result.getNrErrors());
assertEquals(List.of("CREATE (:A)", "CREATE (:B)", "AUTO", "CREATE (:C)"),
database.executed);
assertEquals(List.of("AUTO"), database.autoCommitted);
@@ -115,7 +115,7 @@ class CypherScriptTransactionTest {
Result result = action.execute(new Result(), 0);
- assertFalse(result.getResult());
+ assertFalse(result.isResult());
assertEquals(1, result.getNrErrors());
assertEquals(List.of("CREATE (:A)", "AUTO", "FAIL"), database.executed);
assertEquals(List.of("AUTO"), database.autoCommitted);
@@ -132,7 +132,7 @@ class CypherScriptTransactionTest {
Result result = action.execute(new Result(), 0);
- assertTrue(result.getResult());
+ assertTrue(result.isResult());
assertEquals(List.of(), database.autoCommitted);
assertEquals(1, database.commits);
}
@@ -248,11 +248,6 @@ class CypherScriptTransactionTest {
return dialect;
}
- @Override
- public boolean isSupportingTransactions() {
- return true;
- }
-
@Override
public void close() {
// Nothing to close
diff --git
a/plugins/tech/neo4j/src/test/java/org/apache/hop/neo4j/shared/ThirdPartyGraphDialectTest.java
b/plugins/tech/neo4j/src/test/java/org/apache/hop/neo4j/shared/ThirdPartyGraphDialectTest.java
index fbf5da9354..250e08b234 100644
---
a/plugins/tech/neo4j/src/test/java/org/apache/hop/neo4j/shared/ThirdPartyGraphDialectTest.java
+++
b/plugins/tech/neo4j/src/test/java/org/apache/hop/neo4j/shared/ThirdPartyGraphDialectTest.java
@@ -18,6 +18,7 @@
package org.apache.hop.neo4j.shared;
import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertSame;
import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -98,7 +99,7 @@ class ThirdPartyGraphDialectTest {
.add(new IndexUpdate(UpdateType.CREATE, ObjectType.NODE, "i", "My
Label", "id"));
action.setMetadataProvider(metadataProvider);
Result result = action.execute(new Result(), 0);
- assertTrue(result.getResult());
+ assertTrue(result.isResult());
assertEquals(List.of("ACME CREATE INDEX ON `My Label`"),
database.executed);
// The indexes Graph Output and Neo4j Output create
@@ -138,7 +139,7 @@ class ThirdPartyGraphDialectTest {
.getIndexUpdates()
.add(new IndexUpdate(UpdateType.CREATE, ObjectType.NODE, "i",
"Person", "id"));
action.setMetadataProvider(metadataProvider);
- assertTrue(action.execute(new Result(), 0).getResult());
+ assertTrue(action.execute(new Result(), 0).isResult());
assertEquals(List.of("ACME CREATE INDEX ON test_graph.`Person`"),
database.executed);
}
@@ -174,8 +175,8 @@ class ThirdPartyGraphDialectTest {
assertTrue(database.executed.isEmpty());
assertEquals("$v", unknown.vectorValue("$v"));
- assertTrue(
- !NeoExecutionViewerTabBase.buildPathToRootCypher(true,
unknown).contains("shortestPath"));
+ assertFalse(
+ NeoExecutionViewerTabBase.buildPathToRootCypher(true,
unknown).contains("shortestPath"));
}
/** Creating a Memgraph vector index twice, or dropping it twice, is not an
error. */