This is an automated email from the ASF dual-hosted git repository.
kmarton pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/oozie.git
The following commit(s) were added to refs/heads/master by this push:
new dbbcb4d OOZIE-3522 Migrate from Guava's Joiner (asalamon74 via
kmarton)
dbbcb4d is described below
commit dbbcb4d44f9caa332a32c9d4622c48bc61cc489d
Author: kmarton <[email protected]>
AuthorDate: Wed Jul 3 13:23:42 2019 +0200
OOZIE-3522 Migrate from Guava's Joiner (asalamon74 via kmarton)
---
.../main/java/org/apache/oozie/service/ActionConfFileType.java | 8 ++++++--
.../java/org/apache/oozie/service/JvmPauseMonitorService.java | 3 +--
core/src/main/java/org/apache/oozie/util/db/CompositeIndex.java | 4 +---
.../org/apache/oozie/workflow/lite/LiteWorkflowValidator.java | 6 ++----
release-log.txt | 1 +
5 files changed, 11 insertions(+), 11 deletions(-)
diff --git
a/core/src/main/java/org/apache/oozie/service/ActionConfFileType.java
b/core/src/main/java/org/apache/oozie/service/ActionConfFileType.java
index 1753b47..89a9a4a 100644
--- a/core/src/main/java/org/apache/oozie/service/ActionConfFileType.java
+++ b/core/src/main/java/org/apache/oozie/service/ActionConfFileType.java
@@ -18,7 +18,7 @@
package org.apache.oozie.service;
-import com.google.common.base.Joiner;
+import java.util.Arrays;
enum ActionConfFileType {
XML(".xml"),
@@ -51,6 +51,10 @@ enum ActionConfFileType {
}
throw new UnsupportedOperationException(String.format(
"Unsupported action conf file extension for file %s, supported
extension are %s", fileName,
- Joiner.on(", ").join(values())));
+ String.join(", ", names())));
+ }
+
+ public static String[] names() {
+ return Arrays.toString(values()).replaceAll("^.|.$", "").split(", ");
}
}
diff --git
a/core/src/main/java/org/apache/oozie/service/JvmPauseMonitorService.java
b/core/src/main/java/org/apache/oozie/service/JvmPauseMonitorService.java
index 09a3b88..bdfb1a1 100644
--- a/core/src/main/java/org/apache/oozie/service/JvmPauseMonitorService.java
+++ b/core/src/main/java/org/apache/oozie/service/JvmPauseMonitorService.java
@@ -18,7 +18,6 @@
package org.apache.oozie.service;
-import com.google.common.base.Joiner;
import com.google.common.base.Preconditions;
import com.google.common.collect.Maps;
import com.google.common.collect.Sets;
@@ -110,7 +109,7 @@ public class JvmPauseMonitorService implements Service {
if (gcDiffs.isEmpty()) {
ret += "No GCs detected";
} else {
- ret += Joiner.on("\n").join(gcDiffs);
+ ret += String.join("\n", gcDiffs);
}
return ret;
}
diff --git a/core/src/main/java/org/apache/oozie/util/db/CompositeIndex.java
b/core/src/main/java/org/apache/oozie/util/db/CompositeIndex.java
index 687f4dc..0b2d428 100644
--- a/core/src/main/java/org/apache/oozie/util/db/CompositeIndex.java
+++ b/core/src/main/java/org/apache/oozie/util/db/CompositeIndex.java
@@ -18,8 +18,6 @@
package org.apache.oozie.util.db;
-import com.google.common.base.Joiner;
-
import java.util.Arrays;
import java.util.List;
import java.util.stream.Collectors;
@@ -39,7 +37,7 @@ public enum CompositeIndex {
private final String createStatement;
CompositeIndex(String tableName, String ... columnNames) {
- final String columns = Joiner.on(", ").join(columnNames);
+ final String columns = String.join(", ", columnNames);
this.createStatement = String.format("CREATE INDEX %s ON %s (%s)",
name(), tableName.toUpperCase(), columns);
}
diff --git
a/core/src/main/java/org/apache/oozie/workflow/lite/LiteWorkflowValidator.java
b/core/src/main/java/org/apache/oozie/workflow/lite/LiteWorkflowValidator.java
index 992e1e4..eceb019 100644
---
a/core/src/main/java/org/apache/oozie/workflow/lite/LiteWorkflowValidator.java
+++
b/core/src/main/java/org/apache/oozie/workflow/lite/LiteWorkflowValidator.java
@@ -39,8 +39,6 @@ import org.apache.oozie.workflow.WorkflowException;
import org.jdom.Element;
import org.jdom.JDOMException;
-import com.google.common.base.Joiner;
-
public class LiteWorkflowValidator {
public void validateWorkflow(LiteWorkflowApp app, boolean
validateForkJoin) throws WorkflowException {
@@ -306,7 +304,7 @@ public class LiteWorkflowValidator {
private void checkCycle(Deque<String> path, String nodeName) throws
WorkflowException {
if (path.contains(nodeName)) {
path.addLast(nodeName);
- throw new WorkflowException(ErrorCode.E0707, nodeName,
Joiner.on("->").join(path));
+ throw new WorkflowException(ErrorCode.E0707, nodeName,
String.join("->", path));
}
}
@@ -339,7 +337,7 @@ public class LiteWorkflowValidator {
}
if (joinNodes.size() > 1) {
- throw new WorkflowException(ErrorCode.E0757, forkName,
Joiner.on(",").join(joinNodes));
+ throw new WorkflowException(ErrorCode.E0757, forkName,
String.join(",", joinNodes));
}
}
diff --git a/release-log.txt b/release-log.txt
index 6031a2f..aceb29a 100644
--- a/release-log.txt
+++ b/release-log.txt
@@ -1,5 +1,6 @@
-- Oozie 5.2.0 release (trunk - unreleased)
+OOZIE-3522 Migrate from Guava's Joiner (asalamon74 via kmarton)
OOZIE-3520 Upgrade Derby to 10.14.2.0 (nobigo via asalamon74)
OOZIE-3513 Migrate from Preconditions.checkNotNull and ParamChecker.notNull
(asalamon74 via kmarton)
OOZIE-2907 Delete PrepareActionsDriver from oozie-sharelib (asalamon74 via
kmarton)
