OOZIE-3513 Migrate from Preconditions.checkNotNull and ParamChecker.notNull (asalamon74 via kmarton)
diff --git a/client/src/main/java/org/apache/oozie/client/ApiJarFactory.java b/client/src/main/java/org/apache/oozie/client/ApiJarFactory.java
index bb85d67..8578abc 100644
--- a/client/src/main/java/org/apache/oozie/client/ApiJarFactory.java
+++ b/client/src/main/java/org/apache/oozie/client/ApiJarFactory.java
@@ -29,6 +29,7 @@
import java.io.FileInputStream;
import java.io.FileOutputStream;
import java.io.IOException;
+import java.util.Objects;
import java.util.jar.Attributes;
import java.util.jar.JarEntry;
import java.util.jar.JarFile;
@@ -50,10 +51,10 @@
ApiJarFactory(final File classFolder,
File jarFolder, final Class<? extends WorkflowFactory> apiFactoryClass, final String apiJarName) {
- Preconditions.checkNotNull(classFolder, "classFolder should be set");
- Preconditions.checkNotNull(jarFolder, "jarFolder should be set");
- Preconditions.checkNotNull(apiJarName, "apiJarName should be set");
- Preconditions.checkNotNull(apiFactoryClass, "apiFactoryClass should be set");
+ Objects.requireNonNull(classFolder, "classFolder should be set");
+ Objects.requireNonNull(jarFolder, "jarFolder should be set");
+ Objects.requireNonNull(apiJarName, "apiJarName should be set");
+ Objects.requireNonNull(apiFactoryClass, "apiFactoryClass should be set");
Preconditions.checkState(WorkflowFactory.class.isAssignableFrom(apiFactoryClass),
String.format("%s should be a %s", apiFactoryClass.getName(), WorkflowFactory.class.getName()));
diff --git a/client/src/main/java/org/apache/oozie/client/ApiJarLoader.java b/client/src/main/java/org/apache/oozie/client/ApiJarLoader.java
index 6ecf485..e526d3a 100644
--- a/client/src/main/java/org/apache/oozie/client/ApiJarLoader.java
+++ b/client/src/main/java/org/apache/oozie/client/ApiJarLoader.java
@@ -29,6 +29,7 @@
import java.lang.reflect.Method;
import java.net.URL;
import java.net.URLClassLoader;
+import java.util.Objects;
import java.util.jar.Attributes;
import java.util.jar.JarFile;
@@ -56,7 +57,7 @@
final URLClassLoader workflowFactoryClassLoader = URLClassLoader.newInstance(new URL[]{apiJarFile.toURI().toURL()});
final Class mainClass = workflowFactoryClassLoader.loadClass(mainClassName);
- Preconditions.checkNotNull(mainClass, "Fluent Job API JAR file should have a main class");
+ Objects.requireNonNull(mainClass, "Fluent Job API JAR file should have a main class");
Preconditions.checkState(WorkflowFactory.class.isAssignableFrom(mainClass),
"Fluent Job API JAR main class should be an " + WorkflowFactory.class.getName());
@@ -70,7 +71,7 @@
private String getMainClassName() throws IOException {
try (final JarFile apiJar = new JarFile(apiJarFile)) {
- Preconditions.checkNotNull(apiJar.getManifest(), "Fluent Job API JAR doesn't have MANIFEST.MF");
+ Objects.requireNonNull(apiJar.getManifest(), "Fluent Job API JAR doesn't have MANIFEST.MF");
return apiJar.getManifest().getMainAttributes().getValue(Attributes.Name.MAIN_CLASS);
}
diff --git a/core/src/main/java/org/apache/oozie/BaseLocalOozieClient.java b/core/src/main/java/org/apache/oozie/BaseLocalOozieClient.java
index 376ea11..f8205c1 100644
--- a/core/src/main/java/org/apache/oozie/BaseLocalOozieClient.java
+++ b/core/src/main/java/org/apache/oozie/BaseLocalOozieClient.java
@@ -18,7 +18,6 @@
package org.apache.oozie;
-import com.google.common.base.Preconditions;
import org.apache.oozie.client.BulkResponse;
import org.apache.oozie.client.BundleJob;
import org.apache.oozie.client.CoordinatorAction;
@@ -41,6 +40,7 @@
import java.util.Iterator;
import java.util.List;
import java.util.Map;
+import java.util.Objects;
import java.util.Properties;
import static org.apache.oozie.BaseEngine.BaseEngineCallable;
@@ -54,7 +54,7 @@
private final BaseEngine engine;
BaseLocalOozieClient(final BaseEngine engine) {
- Preconditions.checkNotNull(engine);
+ Objects.requireNonNull(engine);
this.engine = engine;
}
diff --git a/core/src/main/java/org/apache/oozie/XException.java b/core/src/main/java/org/apache/oozie/XException.java
index fb1a381..ab34589 100644
--- a/core/src/main/java/org/apache/oozie/XException.java
+++ b/core/src/main/java/org/apache/oozie/XException.java
@@ -19,7 +19,8 @@
package org.apache.oozie;
import org.apache.oozie.util.XLog;
-import org.apache.oozie.util.ParamChecker;
+
+import java.util.Objects;
/**
* Base exception for all Oozie exception. <p> It requires error codes an captures the Log info at exception time. <p>
@@ -37,7 +38,7 @@
*/
private XException(String message, ErrorCode errorCode, Throwable cause) {
super(message, cause);
- this.errorCode = ParamChecker.notNull(errorCode, "errorCode");
+ this.errorCode = Objects.requireNonNull(errorCode, "errorCode cannot be null");
}
/**
diff --git a/core/src/main/java/org/apache/oozie/action/ActionExecutorException.java b/core/src/main/java/org/apache/oozie/action/ActionExecutorException.java
index 9bc0e81..35a23c5 100644
--- a/core/src/main/java/org/apache/oozie/action/ActionExecutorException.java
+++ b/core/src/main/java/org/apache/oozie/action/ActionExecutorException.java
@@ -21,6 +21,8 @@
import org.apache.oozie.util.ParamChecker;
import org.apache.oozie.util.XLog;
+import java.util.Objects;
+
/**
* ActionExecutor exception. <p> The exception provides information regarding the transient/no-transient/fatal nature
* of the exception.
@@ -66,7 +68,7 @@
*/
public ActionExecutorException(ErrorType errorType, String errorCode, String message) {
super(message);
- this.errorType = ParamChecker.notNull(errorType, "errorType");
+ this.errorType = Objects.requireNonNull(errorType, "errorType cannot be null");
this.errorCode = ParamChecker.notEmpty(errorCode, "errorCode");
}
@@ -83,7 +85,7 @@
*/
public ActionExecutorException(ErrorType errorType, String errorCode, String messageTemplate, Object... params) {
super(errorCode + ": " + XLog.format(messageTemplate, params), XLog.getCause(params));
- this.errorType = ParamChecker.notNull(errorType, "errorType");
+ this.errorType = Objects.requireNonNull(errorType, "errorType cannot be null");
this.errorCode = ParamChecker.notEmpty(errorCode, "errorCode");
}
diff --git a/core/src/main/java/org/apache/oozie/action/hadoop/GitActionExecutor.java b/core/src/main/java/org/apache/oozie/action/hadoop/GitActionExecutor.java
index fc4d65b..1c6c6a6 100644
--- a/core/src/main/java/org/apache/oozie/action/hadoop/GitActionExecutor.java
+++ b/core/src/main/java/org/apache/oozie/action/hadoop/GitActionExecutor.java
@@ -25,8 +25,8 @@
import java.net.UnknownHostException;
import java.net.URISyntaxException;
import java.util.List;
+import java.util.Objects;
-import com.google.common.base.Preconditions;
import org.apache.hadoop.util.DiskChecker;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.FileStatus;
@@ -192,7 +192,7 @@
* Otherwise, set actionConf value displayName to XML trimmed text value
*/
void checkTrimAndSet(String displayName, Element value) {
- Preconditions.checkNotNull(value, "Action Configuration does not have [%s] property", displayName);
+ Objects.requireNonNull(value, () -> String.format("Action Configuration does not have [%s] property", displayName));
actionConf.set(displayName, value.getTextTrim());
}
@@ -201,7 +201,7 @@
* Otherwise, set actionConf value displayName to value
*/
void checkAndSet(String displayName, String value) {
- Preconditions.checkNotNull(value, "Action Configuration does not have [%s] property", displayName);
+ Objects.requireNonNull(value, () -> String.format("Action Configuration does not have [%s] property", displayName));
actionConf.set(displayName, value);
}
@@ -221,7 +221,8 @@
* @param name - actionConf value to return
*/
String checkAndGetTrimmed(String name) {
- Preconditions.checkNotNull(actionConf.getTrimmed(name), "Action Configuration does not have [%s] property", name);
+ Objects.requireNonNull(actionConf.getTrimmed(name),
+ () -> String.format("Action Configuration does not have [%s] property", name));
return actionConf.getTrimmed(name);
}
}
diff --git a/core/src/main/java/org/apache/oozie/action/hadoop/HadoopTokenHelper.java b/core/src/main/java/org/apache/oozie/action/hadoop/HadoopTokenHelper.java
index 1bdeb32..c2a815e 100644
--- a/core/src/main/java/org/apache/oozie/action/hadoop/HadoopTokenHelper.java
+++ b/core/src/main/java/org/apache/oozie/action/hadoop/HadoopTokenHelper.java
@@ -36,6 +36,7 @@
import java.io.IOException;
import java.net.URISyntaxException;
+import java.util.Objects;
public class HadoopTokenHelper {
/** The Kerberos principal for the resource manager.*/
@@ -61,7 +62,7 @@
* {@link SecurityUtil#getServerPrincipal(String, String)}
*/
private String getServerPrincipal(final Configuration configuration, final String servicePrincipal) throws IOException {
- Preconditions.checkNotNull(configuration, "configuration has to be filled");
+ Objects.requireNonNull(configuration, "configuration has to be filled");
Preconditions.checkArgument(!Strings.isNullOrEmpty(servicePrincipal), "servicePrincipal has to be filled");
Preconditions.checkArgument(!Strings.isNullOrEmpty(configuration.get(HADOOP_YARN_RM)),
String.format("configuration entry %s has to be filled", HADOOP_YARN_RM));
diff --git a/core/src/main/java/org/apache/oozie/action/hadoop/JavaActionExecutor.java b/core/src/main/java/org/apache/oozie/action/hadoop/JavaActionExecutor.java
index ec45fe4..dd13744 100644
--- a/core/src/main/java/org/apache/oozie/action/hadoop/JavaActionExecutor.java
+++ b/core/src/main/java/org/apache/oozie/action/hadoop/JavaActionExecutor.java
@@ -1429,7 +1429,7 @@
if (launcherJobConf.get(LauncherAM.OOZIE_LAUNCHER_QUEUE_PROPERTY) != null) {
launcherQueueName = launcherJobConf.get(LauncherAM.OOZIE_LAUNCHER_QUEUE_PROPERTY);
} else {
- launcherQueueName = Preconditions.checkNotNull(
+ launcherQueueName = Objects.requireNonNull(
ConfigurationService.get(DEFAULT_LAUNCHER_QUEUE), "Default launcherQueueName is undefined");
}
appContext.setQueue(launcherQueueName);
diff --git a/core/src/main/java/org/apache/oozie/action/hadoop/MapReduceActionExecutor.java b/core/src/main/java/org/apache/oozie/action/hadoop/MapReduceActionExecutor.java
index a509e4d..b8d3b09 100644
--- a/core/src/main/java/org/apache/oozie/action/hadoop/MapReduceActionExecutor.java
+++ b/core/src/main/java/org/apache/oozie/action/hadoop/MapReduceActionExecutor.java
@@ -27,6 +27,7 @@
import java.util.Comparator;
import java.util.List;
import java.util.Map;
+import java.util.Objects;
import java.util.function.Predicate;
import com.google.common.annotations.VisibleForTesting;
@@ -600,11 +601,11 @@
*/
@VisibleForTesting
protected String getLastYarnId(final List<ApplicationReport> yarnApplications) {
- Preconditions.checkNotNull(yarnApplications, "YARN application list should be filled");
+ Objects.requireNonNull(yarnApplications, "YARN application list should be filled");
Preconditions.checkArgument(!yarnApplications.isEmpty(), "no YARN applications in the list");
return yarnApplications.stream().map(applicationReport -> {
- Preconditions.checkNotNull(applicationReport, "YARN application should be filled");
+ Objects.requireNonNull(applicationReport, "YARN application should be filled");
return applicationReport.getApplicationId().toString();
}).max(new YarnApplicationIdComparator())
.get(); // this is not empty, as yarnApplications was not empty.
diff --git a/core/src/main/java/org/apache/oozie/action/hadoop/ShareLibExcluder.java b/core/src/main/java/org/apache/oozie/action/hadoop/ShareLibExcluder.java
index 9c45e53..242e959 100644
--- a/core/src/main/java/org/apache/oozie/action/hadoop/ShareLibExcluder.java
+++ b/core/src/main/java/org/apache/oozie/action/hadoop/ShareLibExcluder.java
@@ -23,9 +23,9 @@
import org.apache.oozie.util.XLog;
import java.net.URI;
+import java.util.Objects;
import java.util.Optional;
import java.util.regex.Pattern;
-import com.google.common.base.Preconditions;
import static org.apache.oozie.action.hadoop.JavaActionExecutor.ACTION_SHARELIB_FOR;
import static org.apache.oozie.action.hadoop.JavaActionExecutor.SHARELIB_EXCLUDE_SUFFIX;
@@ -50,9 +50,9 @@
return null;
}
- Preconditions.checkNotNull(actionConf, VALUE_NULL_MSG, "actionConf");
- Preconditions.checkNotNull(servicesConf, VALUE_NULL_MSG, "servicesConf");
- Preconditions.checkNotNull(jobConf, VALUE_NULL_MSG, "jobConf");
+ Objects.requireNonNull(actionConf, () -> String.format(VALUE_NULL_MSG, "actionConf"));
+ Objects.requireNonNull(servicesConf, () -> String.format(VALUE_NULL_MSG, "servicesConf"));
+ Objects.requireNonNull(jobConf, () -> String.format(VALUE_NULL_MSG, "jobConf"));
final String excludeProperty = ACTION_SHARELIB_FOR + executorType + SHARELIB_EXCLUDE_SUFFIX;
@@ -88,7 +88,7 @@
}
boolean shouldExclude(final URI actionLibURI) {
- Preconditions.checkNotNull(actionLibURI, VALUE_NULL_MSG, "actionLibURI");
+ Objects.requireNonNull(actionLibURI, () -> String.format(VALUE_NULL_MSG, "actionLibURI"));
if (configuredExcludePattern != null && shareLibRoot != null) {
if (configuredExcludePattern.matcher(shareLibRoot.relativize(actionLibURI).getPath()).matches()) {
diff --git a/core/src/main/java/org/apache/oozie/command/TransitionXCommand.java b/core/src/main/java/org/apache/oozie/command/TransitionXCommand.java
index 262a78f..f8f17ba 100644
--- a/core/src/main/java/org/apache/oozie/command/TransitionXCommand.java
+++ b/core/src/main/java/org/apache/oozie/command/TransitionXCommand.java
@@ -21,6 +21,7 @@
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
+import java.util.Objects;
import org.apache.oozie.CoordinatorActionBean;
import org.apache.oozie.CoordinatorJobBean;
@@ -28,7 +29,6 @@
import org.apache.oozie.client.rest.JsonBean;
import org.apache.oozie.command.coord.CoordinatorXCommand;
import org.apache.oozie.executor.jpa.BatchQueryExecutor.UpdateEntry;
-import org.apache.oozie.util.ParamChecker;
/**
* This is the base commands for all the jobs related commands . This will drive the statuses for all the jobs and all
@@ -120,7 +120,7 @@
* @param job the job
*/
public void setJob(Job job) {
- this.job = ParamChecker.notNull(job, "job");
+ this.job = Objects.requireNonNull(job, "job cannot be null");
}
}
diff --git a/core/src/main/java/org/apache/oozie/command/bundle/BundleJobResumeXCommand.java b/core/src/main/java/org/apache/oozie/command/bundle/BundleJobResumeXCommand.java
index bc58be6..388d39e 100644
--- a/core/src/main/java/org/apache/oozie/command/bundle/BundleJobResumeXCommand.java
+++ b/core/src/main/java/org/apache/oozie/command/bundle/BundleJobResumeXCommand.java
@@ -20,6 +20,7 @@
import java.util.Date;
import java.util.List;
+import java.util.Objects;
import org.apache.oozie.BundleActionBean;
import org.apache.oozie.BundleJobBean;
@@ -40,7 +41,6 @@
import org.apache.oozie.service.Services;
import org.apache.oozie.util.InstrumentUtils;
import org.apache.oozie.util.LogUtils;
-import org.apache.oozie.util.ParamChecker;
public class BundleJobResumeXCommand extends ResumeTransitionXCommand {
@@ -56,7 +56,7 @@
*/
public BundleJobResumeXCommand(String jobId) {
super("bundle_resume", "bundle_resume", 1);
- this.bundleId = ParamChecker.notNull(jobId, "BundleId");
+ this.bundleId = Objects.requireNonNull(jobId, "BundleId cannot be null");
}
@Override
diff --git a/core/src/main/java/org/apache/oozie/command/bundle/BundleSubmitXCommand.java b/core/src/main/java/org/apache/oozie/command/bundle/BundleSubmitXCommand.java
index ab88cac..fee4fa3 100644
--- a/core/src/main/java/org/apache/oozie/command/bundle/BundleSubmitXCommand.java
+++ b/core/src/main/java/org/apache/oozie/command/bundle/BundleSubmitXCommand.java
@@ -30,6 +30,7 @@
import java.util.HashSet;
import java.util.List;
import java.util.Map;
+import java.util.Objects;
import java.util.Set;
import javax.xml.transform.stream.StreamSource;
@@ -100,7 +101,7 @@
*/
public BundleSubmitXCommand(Configuration conf) {
super("bundle_submit", "bundle_submit", 1);
- this.conf = ParamChecker.notNull(conf, "conf");
+ this.conf = Objects.requireNonNull(conf, "conf cannot be null");
}
/**
diff --git a/core/src/main/java/org/apache/oozie/command/coord/CoordActionNotificationXCommand.java b/core/src/main/java/org/apache/oozie/command/coord/CoordActionNotificationXCommand.java
index d51f0d7..85b2803 100644
--- a/core/src/main/java/org/apache/oozie/command/coord/CoordActionNotificationXCommand.java
+++ b/core/src/main/java/org/apache/oozie/command/coord/CoordActionNotificationXCommand.java
@@ -20,6 +20,7 @@
import java.io.IOException;
import java.io.StringReader;
+import java.util.Objects;
import org.apache.hadoop.conf.Configuration;
import org.apache.oozie.CoordinatorActionBean;
@@ -29,7 +30,6 @@
import org.apache.oozie.command.NotificationXCommand;
import org.apache.oozie.service.Services;
import org.apache.oozie.util.LogUtils;
-import org.apache.oozie.util.ParamChecker;
import org.apache.oozie.util.XConfiguration;
/**
@@ -46,8 +46,7 @@
public CoordActionNotificationXCommand(CoordinatorActionBean actionBean) {
super("coord_action_notification", "coord_action_notification", 0);
- ParamChecker.notNull(actionBean, "Action Bean");
- this.actionBean = actionBean;
+ this.actionBean = Objects.requireNonNull(actionBean, "Action Bean cannot be null");
jobId = actionBean.getId();
}
diff --git a/core/src/main/java/org/apache/oozie/command/coord/CoordActionSkipXCommand.java b/core/src/main/java/org/apache/oozie/command/coord/CoordActionSkipXCommand.java
index ef0fc2d..14335c3 100644
--- a/core/src/main/java/org/apache/oozie/command/coord/CoordActionSkipXCommand.java
+++ b/core/src/main/java/org/apache/oozie/command/coord/CoordActionSkipXCommand.java
@@ -19,6 +19,7 @@
package org.apache.oozie.command.coord;
import java.util.Date;
+import java.util.Objects;
import org.apache.oozie.CoordinatorActionBean;
import org.apache.oozie.ErrorCode;
@@ -46,7 +47,7 @@
public CoordActionSkipXCommand(CoordinatorActionBean actionBean, String user, String appName) {
super("coord_action_timeout", "coord_action_timeout", 1);
- this.actionBean = ParamChecker.notNull(actionBean, "ActionBean");
+ this.actionBean = Objects.requireNonNull(actionBean, "ActionBean cannot be null");
this.user = ParamChecker.notEmpty(user, "user");
this.appName = ParamChecker.notEmpty(appName, "appName");
}
diff --git a/core/src/main/java/org/apache/oozie/command/coord/CoordActionTimeOutXCommand.java b/core/src/main/java/org/apache/oozie/command/coord/CoordActionTimeOutXCommand.java
index 9646d73..60e7980 100644
--- a/core/src/main/java/org/apache/oozie/command/coord/CoordActionTimeOutXCommand.java
+++ b/core/src/main/java/org/apache/oozie/command/coord/CoordActionTimeOutXCommand.java
@@ -19,6 +19,7 @@
package org.apache.oozie.command.coord;
import java.util.Date;
+import java.util.Objects;
import org.apache.oozie.CoordinatorActionBean;
import org.apache.oozie.ErrorCode;
@@ -46,7 +47,7 @@
public CoordActionTimeOutXCommand(CoordinatorActionBean actionBean, String user, String appName) {
super("coord_action_timeout", "coord_action_timeout", 1);
- this.actionBean = ParamChecker.notNull(actionBean, "ActionBean");
+ this.actionBean = Objects.requireNonNull(actionBean, "ActionBean cannot be null");
this.user = ParamChecker.notEmpty(user, "user");
this.appName = ParamChecker.notEmpty(appName, "appName");
}
diff --git a/core/src/main/java/org/apache/oozie/command/coord/CoordActionsIgnoreXCommand.java b/core/src/main/java/org/apache/oozie/command/coord/CoordActionsIgnoreXCommand.java
index 88842f1..b5997dd 100644
--- a/core/src/main/java/org/apache/oozie/command/coord/CoordActionsIgnoreXCommand.java
+++ b/core/src/main/java/org/apache/oozie/command/coord/CoordActionsIgnoreXCommand.java
@@ -20,6 +20,7 @@
import java.util.Date;
import java.util.List;
+import java.util.Objects;
import org.apache.oozie.CoordinatorActionBean;
import org.apache.oozie.CoordinatorActionInfo;
@@ -91,7 +92,7 @@
throw new CommandException(ErrorCode.E1024, "no actions are eligible to ignore");
}
for (CoordinatorActionBean action : coordActions) {
- ParamChecker.notNull(action, "Action");
+ Objects.requireNonNull(action, "Action cannot be null");
if (!(action.getStatus() == Status.FAILED || action.getStatus() == Status.KILLED
|| action.getStatus() == Status.TIMEDOUT)) {
LOG.info("Cannot ignore coord action = [{0}], since its status is [{1}]", action.getId(),
diff --git a/core/src/main/java/org/apache/oozie/command/coord/CoordRerunXCommand.java b/core/src/main/java/org/apache/oozie/command/coord/CoordRerunXCommand.java
index 2f158cd..4b20ebf 100644
--- a/core/src/main/java/org/apache/oozie/command/coord/CoordRerunXCommand.java
+++ b/core/src/main/java/org/apache/oozie/command/coord/CoordRerunXCommand.java
@@ -28,6 +28,7 @@
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
+import java.util.Objects;
import org.apache.hadoop.conf.Configuration;
import org.apache.oozie.CoordinatorActionBean;
@@ -124,7 +125,7 @@
* @return true if all actions are eligible to rerun
*/
private static boolean checkAllActionsRunnable(List<CoordinatorActionBean> coordActions) {
- ParamChecker.notNull(coordActions, "Coord actions to be rerun");
+ Objects.requireNonNull(coordActions, "Coord actions to be rerun cannot be null");
boolean ret = false;
for (CoordinatorActionBean coordAction : coordActions) {
ret = true;
diff --git a/core/src/main/java/org/apache/oozie/command/coord/CoordSubmitXCommand.java b/core/src/main/java/org/apache/oozie/command/coord/CoordSubmitXCommand.java
index 2622f05..36c138d 100644
--- a/core/src/main/java/org/apache/oozie/command/coord/CoordSubmitXCommand.java
+++ b/core/src/main/java/org/apache/oozie/command/coord/CoordSubmitXCommand.java
@@ -34,6 +34,7 @@
import java.util.Iterator;
import java.util.List;
import java.util.Map;
+import java.util.Objects;
import java.util.Set;
import java.util.TreeSet;
@@ -164,7 +165,7 @@
*/
public CoordSubmitXCommand(Configuration conf) {
super("coord_submit", "coord_submit", 1);
- this.conf = ParamChecker.notNull(conf, "conf");
+ this.conf = Objects.requireNonNull(conf, "conf cannot be null");
this.bundleId = null;
this.coordName = null;
}
@@ -178,7 +179,7 @@
*/
protected CoordSubmitXCommand(Configuration conf, String bundleId, String coordName) {
super("coord_submit", "coord_submit", 1);
- this.conf = ParamChecker.notNull(conf, "conf");
+ this.conf = Objects.requireNonNull(conf, "conf cannot be null");
this.bundleId = ParamChecker.notEmpty(bundleId, "bundleId");
this.coordName = ParamChecker.notEmpty(coordName, "coordName");
}
diff --git a/core/src/main/java/org/apache/oozie/command/wf/ReRunXCommand.java b/core/src/main/java/org/apache/oozie/command/wf/ReRunXCommand.java
index dd8d3d2..92c0a67 100644
--- a/core/src/main/java/org/apache/oozie/command/wf/ReRunXCommand.java
+++ b/core/src/main/java/org/apache/oozie/command/wf/ReRunXCommand.java
@@ -28,6 +28,7 @@
import java.util.HashSet;
import java.util.List;
import java.util.Map;
+import java.util.Objects;
import java.util.Set;
import org.apache.hadoop.conf.Configuration;
@@ -107,7 +108,7 @@
public ReRunXCommand(String jobId, Configuration conf) {
super("rerun", "rerun", 1);
this.jobId = ParamChecker.notEmpty(jobId, "jobId");
- this.conf = ParamChecker.notNull(conf, "conf");
+ this.conf = Objects.requireNonNull(conf, "conf cannot be null");
}
@Override
diff --git a/core/src/main/java/org/apache/oozie/command/wf/SubmitHttpXCommand.java b/core/src/main/java/org/apache/oozie/command/wf/SubmitHttpXCommand.java
index 9ee8406..5e39e03 100644
--- a/core/src/main/java/org/apache/oozie/command/wf/SubmitHttpXCommand.java
+++ b/core/src/main/java/org/apache/oozie/command/wf/SubmitHttpXCommand.java
@@ -29,7 +29,6 @@
import org.apache.oozie.util.InstrumentUtils;
import org.apache.oozie.util.LogUtils;
import org.apache.oozie.util.XLog;
-import org.apache.oozie.util.ParamChecker;
import org.apache.oozie.util.XConfiguration;
import org.apache.oozie.util.XmlUtils;
import org.apache.oozie.command.CommandException;
@@ -51,6 +50,7 @@
import java.util.Date;
import java.util.List;
import java.util.Map;
+import java.util.Objects;
import java.util.Set;
import java.util.HashSet;
@@ -63,7 +63,7 @@
public SubmitHttpXCommand(String name, String type, Configuration conf) {
super(name, type, 1);
- this.conf = ParamChecker.notNull(conf, "conf");
+ this.conf = Objects.requireNonNull(conf, "conf cannot be null");
}
private static final Set<String> DISALLOWED_USER_PROPERTIES = new HashSet<String>();
diff --git a/core/src/main/java/org/apache/oozie/command/wf/SubmitXCommand.java b/core/src/main/java/org/apache/oozie/command/wf/SubmitXCommand.java
index 70b9adc..1352db9 100644
--- a/core/src/main/java/org/apache/oozie/command/wf/SubmitXCommand.java
+++ b/core/src/main/java/org/apache/oozie/command/wf/SubmitXCommand.java
@@ -39,7 +39,6 @@
import org.apache.oozie.util.LogUtils;
import org.apache.oozie.sla.SLAOperations;
import org.apache.oozie.util.XLog;
-import org.apache.oozie.util.ParamChecker;
import org.apache.oozie.util.XConfiguration;
import org.apache.oozie.util.XmlUtils;
import org.apache.oozie.command.CommandException;
@@ -68,6 +67,7 @@
import java.util.Iterator;
import java.util.List;
import java.util.Map;
+import java.util.Objects;
import java.util.Set;
import java.util.HashSet;
import java.io.IOException;
@@ -88,7 +88,7 @@
*/
public SubmitXCommand(Configuration conf) {
super("submit", "submit", 1);
- this.conf = ParamChecker.notNull(conf, "conf");
+ this.conf = Objects.requireNonNull(conf, "conf cannot be null");
}
/**
diff --git a/core/src/main/java/org/apache/oozie/command/wf/WorkflowNotificationXCommand.java b/core/src/main/java/org/apache/oozie/command/wf/WorkflowNotificationXCommand.java
index 62bf9b5..746f41b 100644
--- a/core/src/main/java/org/apache/oozie/command/wf/WorkflowNotificationXCommand.java
+++ b/core/src/main/java/org/apache/oozie/command/wf/WorkflowNotificationXCommand.java
@@ -25,7 +25,8 @@
import org.apache.oozie.command.NotificationXCommand;
import org.apache.oozie.service.ConfigurationService;
import org.apache.oozie.util.LogUtils;
-import org.apache.oozie.util.ParamChecker;
+
+import java.util.Objects;
public class WorkflowNotificationXCommand extends NotificationXCommand {
@@ -36,7 +37,7 @@
public WorkflowNotificationXCommand(WorkflowJobBean workflow) {
super("job.notification", "job.notification", 0);
- ParamChecker.notNull(workflow, "workflow");
+ Objects.requireNonNull(workflow, "workflow cannot be null");
jobId = workflow.getId();
url = workflow.getWorkflowInstance().getConf().get(OozieClient.WORKFLOW_NOTIFICATION_URL);
if (url != null) {
@@ -55,8 +56,8 @@
public WorkflowNotificationXCommand(WorkflowJobBean workflow, WorkflowActionBean action) {
super("action.notification", "job.notification", 0);
- ParamChecker.notNull(workflow, "workflow");
- ParamChecker.notNull(action, "action");
+ Objects.requireNonNull(workflow, "workflow cannot be null");
+ Objects.requireNonNull(action, "action cannot be null");
jobId = action.getId();
url = workflow.getWorkflowInstance().getConf().get(OozieClient.ACTION_NOTIFICATION_URL);
if (url != null) {
diff --git a/core/src/main/java/org/apache/oozie/coord/CoordELFunctions.java b/core/src/main/java/org/apache/oozie/coord/CoordELFunctions.java
index 2761e44..9de76dc 100644
--- a/core/src/main/java/org/apache/oozie/coord/CoordELFunctions.java
+++ b/core/src/main/java/org/apache/oozie/coord/CoordELFunctions.java
@@ -188,8 +188,8 @@
*/
public static int ph2_coord_tzOffset() {
long actionCreationTime = getActionCreationtime().getTime();
- TimeZone dsTZ = ParamChecker.notNull(getDatasetTZ(), "DatasetTZ");
- TimeZone jobTZ = ParamChecker.notNull(getJobTZ(), "JobTZ");
+ TimeZone dsTZ = Objects.requireNonNull(getDatasetTZ(), "DatasetTZ cannot be null");
+ TimeZone jobTZ = Objects.requireNonNull(getJobTZ(), "JobTZ cannot be null");
return (dsTZ.getOffset(actionCreationTime) - jobTZ.getOffset(actionCreationTime)) / (1000 * 60);
}
@@ -340,8 +340,8 @@
*/
public static String ph2_coord_nominalTime() throws Exception {
ELEvaluator eval = ELEvaluator.getCurrent();
- SyncCoordAction action = ParamChecker.notNull((SyncCoordAction) eval.getVariable(COORD_ACTION),
- "Coordinator Action");
+ SyncCoordAction action = Objects.requireNonNull((SyncCoordAction) eval.getVariable(COORD_ACTION),
+ "Coordinator Action cannot be null");
return DateUtils.formatDateOozieTZ(action.getNominalTime());
}
@@ -393,8 +393,8 @@
*/
public static String ph2_coord_actionId() throws Exception {
ELEvaluator eval = ELEvaluator.getCurrent();
- SyncCoordAction action = ParamChecker.notNull((SyncCoordAction) eval.getVariable(COORD_ACTION),
- "Coordinator Action");
+ SyncCoordAction action = Objects.requireNonNull((SyncCoordAction) eval.getVariable(COORD_ACTION),
+ "Coordinator Action cannot be null");
return action.getActionId();
}
@@ -410,8 +410,8 @@
*/
public static String ph2_coord_name() throws Exception {
ELEvaluator eval = ELEvaluator.getCurrent();
- SyncCoordAction action = ParamChecker.notNull((SyncCoordAction) eval.getVariable(COORD_ACTION),
- "Coordinator Action");
+ SyncCoordAction action = Objects.requireNonNull((SyncCoordAction) eval.getVariable(COORD_ACTION),
+ "Coordinator Action cannot be null");
return action.getName();
}
diff --git a/core/src/main/java/org/apache/oozie/coord/CoordUtils.java b/core/src/main/java/org/apache/oozie/coord/CoordUtils.java
index 1d97acc..8c15099 100644
--- a/core/src/main/java/org/apache/oozie/coord/CoordUtils.java
+++ b/core/src/main/java/org/apache/oozie/coord/CoordUtils.java
@@ -25,6 +25,7 @@
import java.util.HashSet;
import java.util.LinkedHashSet;
import java.util.List;
+import java.util.Objects;
import java.util.Set;
import java.util.Map;
import java.util.HashMap;
@@ -75,7 +76,7 @@
public static Configuration getHadoopConf(Configuration jobConf) {
Configuration conf = new Configuration();
- ParamChecker.notNull(jobConf, "Configuration to be used for hadoop setup ");
+ Objects.requireNonNull(jobConf, "Configuration to be used for hadoop setup cannot be null");
String user = ParamChecker.notEmpty(jobConf.get(OozieClient.USER_NAME), OozieClient.USER_NAME);
conf.set(HADOOP_USER, user);
return conf;
diff --git a/core/src/main/java/org/apache/oozie/executor/jpa/BulkJPAExecutor.java b/core/src/main/java/org/apache/oozie/executor/jpa/BulkJPAExecutor.java
index 4296115..86a7394 100644
--- a/core/src/main/java/org/apache/oozie/executor/jpa/BulkJPAExecutor.java
+++ b/core/src/main/java/org/apache/oozie/executor/jpa/BulkJPAExecutor.java
@@ -27,6 +27,7 @@
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
+import java.util.Objects;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
@@ -46,7 +47,6 @@
import org.apache.oozie.client.rest.BulkResponseImpl;
import org.apache.oozie.service.Services;
import org.apache.oozie.util.DateUtils;
-import org.apache.oozie.util.ParamChecker;
/**
* The query executor class for bulk monitoring queries i.e. debugging bundle coord actions directly
@@ -61,8 +61,7 @@
}
public BulkJPAExecutor(Map<String, List<String>> bulkFilter, int start, int len) {
- ParamChecker.notNull(bulkFilter, "bulkFilter");
- this.bulkFilter = bulkFilter;
+ this.bulkFilter = Objects.requireNonNull(bulkFilter, "bulkFilter cannot be null");
this.start = start;
this.len = len;
}
diff --git a/core/src/main/java/org/apache/oozie/executor/jpa/BundleActionGetJPAExecutor.java b/core/src/main/java/org/apache/oozie/executor/jpa/BundleActionGetJPAExecutor.java
index 3293efd..9671950 100644
--- a/core/src/main/java/org/apache/oozie/executor/jpa/BundleActionGetJPAExecutor.java
+++ b/core/src/main/java/org/apache/oozie/executor/jpa/BundleActionGetJPAExecutor.java
@@ -19,13 +19,13 @@
package org.apache.oozie.executor.jpa;
import java.util.List;
+import java.util.Objects;
import javax.persistence.EntityManager;
import javax.persistence.Query;
import org.apache.oozie.BundleActionBean;
import org.apache.oozie.ErrorCode;
-import org.apache.oozie.util.ParamChecker;
/**
* Load the BundleAction into a Bean and return it.
@@ -41,8 +41,8 @@
* @param coordName coordinator name
*/
public BundleActionGetJPAExecutor(String bundleId, String coordName) {
- ParamChecker.notNull(bundleId, "bundleId");
- ParamChecker.notNull(coordName, "coordName");
+ Objects.requireNonNull(bundleId, "bundleId cannot be null");
+ Objects.requireNonNull(coordName, "coordName cannot be null");
this.bundleActionId = bundleId + "_" + coordName;
}
diff --git a/core/src/main/java/org/apache/oozie/executor/jpa/BundleActionInsertJPAExecutor.java b/core/src/main/java/org/apache/oozie/executor/jpa/BundleActionInsertJPAExecutor.java
index 4b99c1a..7e027b7 100644
--- a/core/src/main/java/org/apache/oozie/executor/jpa/BundleActionInsertJPAExecutor.java
+++ b/core/src/main/java/org/apache/oozie/executor/jpa/BundleActionInsertJPAExecutor.java
@@ -21,7 +21,8 @@
import javax.persistence.EntityManager;
import org.apache.oozie.BundleActionBean;
-import org.apache.oozie.util.ParamChecker;
+
+import java.util.Objects;
/**
* Persist the BundleAction bean.
@@ -36,8 +37,7 @@
* @param bundleAction bundle action bean
*/
public BundleActionInsertJPAExecutor(BundleActionBean bundleAction) {
- ParamChecker.notNull(bundleAction, "bundleAction");
- this.bundleAction = bundleAction;
+ this.bundleAction = Objects.requireNonNull(bundleAction, "bundleAction cannot be null");
}
@Override
diff --git a/core/src/main/java/org/apache/oozie/executor/jpa/BundleActionsCountForJobGetJPAExecutor.java b/core/src/main/java/org/apache/oozie/executor/jpa/BundleActionsCountForJobGetJPAExecutor.java
index c9f3a21..7c15cc3 100644
--- a/core/src/main/java/org/apache/oozie/executor/jpa/BundleActionsCountForJobGetJPAExecutor.java
+++ b/core/src/main/java/org/apache/oozie/executor/jpa/BundleActionsCountForJobGetJPAExecutor.java
@@ -22,7 +22,8 @@
import javax.persistence.Query;
import org.apache.oozie.ErrorCode;
-import org.apache.oozie.util.ParamChecker;
+
+import java.util.Objects;
/**
* Load the number of actions for a bundle job.
@@ -32,7 +33,7 @@
private String bundleJobId = null;
public BundleActionsCountForJobGetJPAExecutor(String bundleJobId) {
- ParamChecker.notNull(bundleJobId, "bundleJobId");
+ Objects.requireNonNull(bundleJobId, "bundleJobId cannot be null");
this.bundleJobId = bundleJobId;
}
diff --git a/core/src/main/java/org/apache/oozie/executor/jpa/BundleJobGetCoordinatorsJPAExecutor.java b/core/src/main/java/org/apache/oozie/executor/jpa/BundleJobGetCoordinatorsJPAExecutor.java
index 2f4665e..36f0013 100644
--- a/core/src/main/java/org/apache/oozie/executor/jpa/BundleJobGetCoordinatorsJPAExecutor.java
+++ b/core/src/main/java/org/apache/oozie/executor/jpa/BundleJobGetCoordinatorsJPAExecutor.java
@@ -19,13 +19,13 @@
package org.apache.oozie.executor.jpa;
import java.util.List;
+import java.util.Objects;
import javax.persistence.EntityManager;
import javax.persistence.Query;
import org.apache.oozie.CoordinatorJobBean;
import org.apache.oozie.ErrorCode;
-import org.apache.oozie.util.ParamChecker;
/**
* Load the coordinators for specified bundle in the Coordinator job bean
@@ -34,8 +34,7 @@
private String bundleId = null;
public BundleJobGetCoordinatorsJPAExecutor(String bundleId) {
- ParamChecker.notNull(bundleId, "bundleId");
- this.bundleId = bundleId;
+ this.bundleId = Objects.requireNonNull(bundleId, "bundleId cannot be null");
}
@Override
diff --git a/core/src/main/java/org/apache/oozie/executor/jpa/BundleJobGetForUserJPAExecutor.java b/core/src/main/java/org/apache/oozie/executor/jpa/BundleJobGetForUserJPAExecutor.java
index aef9eb7..c5fb270 100644
--- a/core/src/main/java/org/apache/oozie/executor/jpa/BundleJobGetForUserJPAExecutor.java
+++ b/core/src/main/java/org/apache/oozie/executor/jpa/BundleJobGetForUserJPAExecutor.java
@@ -22,7 +22,8 @@
import javax.persistence.Query;
import org.apache.oozie.ErrorCode;
-import org.apache.oozie.util.ParamChecker;
+
+import java.util.Objects;
/**
* Retrieve the name of the user submitting the bundle job
@@ -33,8 +34,7 @@
private String bundleJobId = null;
public BundleJobGetForUserJPAExecutor(String bundleJobId) {
- ParamChecker.notNull(bundleJobId, "bundleJobId");
- this.bundleJobId = bundleJobId;
+ this.bundleJobId = Objects.requireNonNull(bundleJobId, "bundleJobId cannot be null");
}
public String getName() {
diff --git a/core/src/main/java/org/apache/oozie/executor/jpa/BundleJobGetJPAExecutor.java b/core/src/main/java/org/apache/oozie/executor/jpa/BundleJobGetJPAExecutor.java
index 7f98cd2..88e46a5 100644
--- a/core/src/main/java/org/apache/oozie/executor/jpa/BundleJobGetJPAExecutor.java
+++ b/core/src/main/java/org/apache/oozie/executor/jpa/BundleJobGetJPAExecutor.java
@@ -19,13 +19,13 @@
package org.apache.oozie.executor.jpa;
import java.util.List;
+import java.util.Objects;
import javax.persistence.EntityManager;
import javax.persistence.Query;
import org.apache.oozie.BundleJobBean;
import org.apache.oozie.ErrorCode;
-import org.apache.oozie.util.ParamChecker;
/**
* Load the BundleJob into a Bean and return it.
@@ -35,7 +35,7 @@
private String bundleJobId = null;
public BundleJobGetJPAExecutor(String bundleJobId) {
- ParamChecker.notNull(bundleJobId, "bundleJobId");
+ Objects.requireNonNull(bundleJobId, "bundleJobId cannot be null");
this.bundleJobId = bundleJobId;
}
diff --git a/core/src/main/java/org/apache/oozie/executor/jpa/BundleJobInfoGetJPAExecutor.java b/core/src/main/java/org/apache/oozie/executor/jpa/BundleJobInfoGetJPAExecutor.java
index 6e1ea3e..25bbf82 100644
--- a/core/src/main/java/org/apache/oozie/executor/jpa/BundleJobInfoGetJPAExecutor.java
+++ b/core/src/main/java/org/apache/oozie/executor/jpa/BundleJobInfoGetJPAExecutor.java
@@ -22,6 +22,7 @@
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
+import java.util.Objects;
import javax.persistence.EntityManager;
import javax.persistence.Query;
@@ -32,7 +33,6 @@
import org.apache.oozie.client.Job;
import org.apache.oozie.client.BundleJob.Timeunit;
import org.apache.oozie.store.StoreStatusFilter;
-import org.apache.oozie.util.ParamChecker;
import org.apache.openjpa.persistence.OpenJPAPersistence;
import org.apache.openjpa.persistence.OpenJPAQuery;
import org.apache.openjpa.persistence.jdbc.FetchDirection;
@@ -58,8 +58,7 @@
* @param len total length to get
*/
public BundleJobInfoGetJPAExecutor(Map<String, List<String>> filter, int start, int len) {
- ParamChecker.notNull(filter, "filter");
- this.filter = filter;
+ this.filter = Objects.requireNonNull(filter, "filter cannot be null");
this.start = start;
this.len = len;
}
diff --git a/core/src/main/java/org/apache/oozie/executor/jpa/BundleJobInsertJPAExecutor.java b/core/src/main/java/org/apache/oozie/executor/jpa/BundleJobInsertJPAExecutor.java
index e7373d6..a12c64c 100644
--- a/core/src/main/java/org/apache/oozie/executor/jpa/BundleJobInsertJPAExecutor.java
+++ b/core/src/main/java/org/apache/oozie/executor/jpa/BundleJobInsertJPAExecutor.java
@@ -21,7 +21,8 @@
import javax.persistence.EntityManager;
import org.apache.oozie.BundleJobBean;
-import org.apache.oozie.util.ParamChecker;
+
+import java.util.Objects;
/**
* Persist the BundleJob bean.
@@ -31,8 +32,7 @@
private BundleJobBean bundleJob = null;
public BundleJobInsertJPAExecutor(BundleJobBean bundleJob) {
- ParamChecker.notNull(bundleJob, "bundleJob");
- this.bundleJob = bundleJob;
+ this.bundleJob = Objects.requireNonNull(bundleJob, "bundleJob cannot be null");
}
@Override
diff --git a/core/src/main/java/org/apache/oozie/executor/jpa/CoordActionGetForCheckJPAExecutor.java b/core/src/main/java/org/apache/oozie/executor/jpa/CoordActionGetForCheckJPAExecutor.java
index 9e8b331..4ebe333 100644
--- a/core/src/main/java/org/apache/oozie/executor/jpa/CoordActionGetForCheckJPAExecutor.java
+++ b/core/src/main/java/org/apache/oozie/executor/jpa/CoordActionGetForCheckJPAExecutor.java
@@ -20,6 +20,7 @@
import java.sql.Timestamp;
import java.util.List;
+import java.util.Objects;
import javax.persistence.EntityManager;
import javax.persistence.Query;
@@ -29,7 +30,6 @@
import org.apache.oozie.StringBlob;
import org.apache.oozie.client.CoordinatorAction;
import org.apache.oozie.util.DateUtils;
-import org.apache.oozie.util.ParamChecker;
/**
* JPAExecutor to get attributes of CoordinatorActionBean required by CoordActionCheckCommand
@@ -39,8 +39,7 @@
private String coordActionId = null;
public CoordActionGetForCheckJPAExecutor(String coordActionId) {
- ParamChecker.notNull(coordActionId, "coordActionId");
- this.coordActionId = coordActionId;
+ this.coordActionId = Objects.requireNonNull(coordActionId, "coordActionId cannot be null");
}
@Override
diff --git a/core/src/main/java/org/apache/oozie/executor/jpa/CoordActionGetForExternalIdJPAExecutor.java b/core/src/main/java/org/apache/oozie/executor/jpa/CoordActionGetForExternalIdJPAExecutor.java
index 61614e9..6f2b163 100644
--- a/core/src/main/java/org/apache/oozie/executor/jpa/CoordActionGetForExternalIdJPAExecutor.java
+++ b/core/src/main/java/org/apache/oozie/executor/jpa/CoordActionGetForExternalIdJPAExecutor.java
@@ -20,6 +20,7 @@
import java.sql.Timestamp;
import java.util.List;
+import java.util.Objects;
import javax.persistence.EntityManager;
import javax.persistence.Query;
@@ -29,7 +30,6 @@
import org.apache.oozie.StringBlob;
import org.apache.oozie.client.CoordinatorAction;
import org.apache.oozie.util.DateUtils;
-import org.apache.oozie.util.ParamChecker;
/**
* Load coordinator action by externalId.
@@ -39,8 +39,7 @@
private String externalId = null;
public CoordActionGetForExternalIdJPAExecutor(String externalId) {
- ParamChecker.notNull(externalId, "externalId");
- this.externalId = externalId;
+ this.externalId = Objects.requireNonNull(externalId, "externalId cannot be null");
}
@Override
diff --git a/core/src/main/java/org/apache/oozie/executor/jpa/CoordActionGetForInfoJPAExecutor.java b/core/src/main/java/org/apache/oozie/executor/jpa/CoordActionGetForInfoJPAExecutor.java
index 211d594..649a745 100644
--- a/core/src/main/java/org/apache/oozie/executor/jpa/CoordActionGetForInfoJPAExecutor.java
+++ b/core/src/main/java/org/apache/oozie/executor/jpa/CoordActionGetForInfoJPAExecutor.java
@@ -20,6 +20,7 @@
import java.sql.Timestamp;
import java.util.List;
+import java.util.Objects;
import javax.persistence.EntityManager;
import javax.persistence.Query;
@@ -31,7 +32,6 @@
import org.apache.oozie.service.ConfigurationService;
import org.apache.oozie.service.Services;
import org.apache.oozie.util.DateUtils;
-import org.apache.oozie.util.ParamChecker;
/**
* Load the CoordinatorAction into a Bean and return it.
@@ -42,8 +42,7 @@
public static final String COORD_GET_ALL_COLS_FOR_ACTION = "oozie.coord.action.get.all.attributes";
public CoordActionGetForInfoJPAExecutor(String coordActionId) {
- ParamChecker.notNull(coordActionId, "coordActionId");
- this.coordActionId = coordActionId;
+ this.coordActionId = Objects.requireNonNull(coordActionId, "coordActionId cannot be null");
}
@Override
diff --git a/core/src/main/java/org/apache/oozie/executor/jpa/CoordActionGetForInputCheckJPAExecutor.java b/core/src/main/java/org/apache/oozie/executor/jpa/CoordActionGetForInputCheckJPAExecutor.java
index 484ff93..241bea1 100644
--- a/core/src/main/java/org/apache/oozie/executor/jpa/CoordActionGetForInputCheckJPAExecutor.java
+++ b/core/src/main/java/org/apache/oozie/executor/jpa/CoordActionGetForInputCheckJPAExecutor.java
@@ -19,6 +19,7 @@
package org.apache.oozie.executor.jpa;
import java.sql.Timestamp;
+import java.util.Objects;
import javax.persistence.EntityManager;
import javax.persistence.Query;
@@ -27,7 +28,6 @@
import org.apache.oozie.StringBlob;
import org.apache.oozie.client.CoordinatorAction;
import org.apache.oozie.util.DateUtils;
-import org.apache.oozie.util.ParamChecker;
/**
* JPAExecutor to get attributes of CoordinatorActionBean required by CoordActionInputCheckXCommand
@@ -37,8 +37,7 @@
private String coordActionId = null;
public CoordActionGetForInputCheckJPAExecutor(String coordActionId) {
- ParamChecker.notNull(coordActionId, "coordActionId");
- this.coordActionId = coordActionId;
+ this.coordActionId = Objects.requireNonNull(coordActionId, "coordActionId cannot be null");
}
@Override
diff --git a/core/src/main/java/org/apache/oozie/executor/jpa/CoordActionGetForStartJPAExecutor.java b/core/src/main/java/org/apache/oozie/executor/jpa/CoordActionGetForStartJPAExecutor.java
index 14b831d..08415f3 100644
--- a/core/src/main/java/org/apache/oozie/executor/jpa/CoordActionGetForStartJPAExecutor.java
+++ b/core/src/main/java/org/apache/oozie/executor/jpa/CoordActionGetForStartJPAExecutor.java
@@ -19,6 +19,7 @@
package org.apache.oozie.executor.jpa;
import java.sql.Timestamp;
+import java.util.Objects;
import javax.persistence.EntityManager;
import javax.persistence.Query;
@@ -28,7 +29,6 @@
import org.apache.oozie.StringBlob;
import org.apache.oozie.client.CoordinatorAction;
import org.apache.oozie.util.DateUtils;
-import org.apache.oozie.util.ParamChecker;
/**
* JPAExecutor to get attributes of CoordinatorActionBean required by CoordActionStartXCommand
@@ -38,8 +38,7 @@
private String coordActionId = null;
public CoordActionGetForStartJPAExecutor(String coordActionId) {
- ParamChecker.notNull(coordActionId, "coordActionId");
- this.coordActionId = coordActionId;
+ this.coordActionId = Objects.requireNonNull(coordActionId, "coordActionId cannot be null");
}
@Override
diff --git a/core/src/main/java/org/apache/oozie/executor/jpa/CoordActionGetForTimeoutJPAExecutor.java b/core/src/main/java/org/apache/oozie/executor/jpa/CoordActionGetForTimeoutJPAExecutor.java
index c720be9..d461563 100644
--- a/core/src/main/java/org/apache/oozie/executor/jpa/CoordActionGetForTimeoutJPAExecutor.java
+++ b/core/src/main/java/org/apache/oozie/executor/jpa/CoordActionGetForTimeoutJPAExecutor.java
@@ -19,6 +19,7 @@
package org.apache.oozie.executor.jpa;
import java.sql.Timestamp;
+import java.util.Objects;
import javax.persistence.EntityManager;
import javax.persistence.Query;
@@ -28,7 +29,6 @@
import org.apache.oozie.StringBlob;
import org.apache.oozie.client.CoordinatorAction;
import org.apache.oozie.util.DateUtils;
-import org.apache.oozie.util.ParamChecker;
/**
* JPAExecutor to get attributes of CoordinatorActionBean required by CoordActionTimeoutXCommand
@@ -38,8 +38,7 @@
private String coordActionId = null;
public CoordActionGetForTimeoutJPAExecutor(String coordActionId) {
- ParamChecker.notNull(coordActionId, "coordActionId");
- this.coordActionId = coordActionId;
+ this.coordActionId = Objects.requireNonNull(coordActionId, "coordActionId cannot be null");
}
@Override
diff --git a/core/src/main/java/org/apache/oozie/executor/jpa/CoordActionGetJPAExecutor.java b/core/src/main/java/org/apache/oozie/executor/jpa/CoordActionGetJPAExecutor.java
index 53214ea..a5dfee8 100644
--- a/core/src/main/java/org/apache/oozie/executor/jpa/CoordActionGetJPAExecutor.java
+++ b/core/src/main/java/org/apache/oozie/executor/jpa/CoordActionGetJPAExecutor.java
@@ -19,13 +19,13 @@
package org.apache.oozie.executor.jpa;
import java.util.List;
+import java.util.Objects;
import javax.persistence.EntityManager;
import javax.persistence.Query;
import org.apache.oozie.CoordinatorActionBean;
import org.apache.oozie.ErrorCode;
-import org.apache.oozie.util.ParamChecker;
/**
* Load the CoordinatorAction into a Bean and return it.
@@ -35,8 +35,7 @@
private String coordActionId = null;
public CoordActionGetJPAExecutor(String coordActionId) {
- ParamChecker.notNull(coordActionId, "coordActionId");
- this.coordActionId = coordActionId;
+ this.coordActionId = Objects.requireNonNull(coordActionId, "coordActionId cannot be null");
}
@Override
diff --git a/core/src/main/java/org/apache/oozie/executor/jpa/CoordActionInsertJPAExecutor.java b/core/src/main/java/org/apache/oozie/executor/jpa/CoordActionInsertJPAExecutor.java
index 09e8857..0b9c95e 100644
--- a/core/src/main/java/org/apache/oozie/executor/jpa/CoordActionInsertJPAExecutor.java
+++ b/core/src/main/java/org/apache/oozie/executor/jpa/CoordActionInsertJPAExecutor.java
@@ -21,7 +21,8 @@
import javax.persistence.EntityManager;
import org.apache.oozie.CoordinatorActionBean;
-import org.apache.oozie.util.ParamChecker;
+
+import java.util.Objects;
/**
* Persist the CoordinatorAction bean.
@@ -31,8 +32,7 @@
private CoordinatorActionBean coordAction = null;
public CoordActionInsertJPAExecutor(CoordinatorActionBean coordAction) {
- ParamChecker.notNull(coordAction, "coordAction");
- this.coordAction = coordAction;
+ this.coordAction = Objects.requireNonNull(coordAction, "coordAction cannot be null");
}
@Override
diff --git a/core/src/main/java/org/apache/oozie/executor/jpa/CoordActionRemoveJPAExecutor.java b/core/src/main/java/org/apache/oozie/executor/jpa/CoordActionRemoveJPAExecutor.java
index 8ea31a3..a03910a 100644
--- a/core/src/main/java/org/apache/oozie/executor/jpa/CoordActionRemoveJPAExecutor.java
+++ b/core/src/main/java/org/apache/oozie/executor/jpa/CoordActionRemoveJPAExecutor.java
@@ -22,7 +22,8 @@
import javax.persistence.Query;
import org.apache.oozie.ErrorCode;
-import org.apache.oozie.util.ParamChecker;
+
+import java.util.Objects;
/**
* Deletes the coordinator action if its in WAITING or READY state.
@@ -38,7 +39,7 @@
* @param coordActionId id of coordinator action
*/
public CoordActionRemoveJPAExecutor(String coordActionId) {
- ParamChecker.notNull(coordActionId, "coordActionId");
+ Objects.requireNonNull(coordActionId, "coordActionId cannot be null");
this.coordActionId = coordActionId;
}
diff --git a/core/src/main/java/org/apache/oozie/executor/jpa/CoordActionsActiveCountJPAExecutor.java b/core/src/main/java/org/apache/oozie/executor/jpa/CoordActionsActiveCountJPAExecutor.java
index 384277a..1b73304 100644
--- a/core/src/main/java/org/apache/oozie/executor/jpa/CoordActionsActiveCountJPAExecutor.java
+++ b/core/src/main/java/org/apache/oozie/executor/jpa/CoordActionsActiveCountJPAExecutor.java
@@ -22,7 +22,8 @@
import javax.persistence.Query;
import org.apache.oozie.ErrorCode;
-import org.apache.oozie.util.ParamChecker;
+
+import java.util.Objects;
/**
* Load the number of running actions for a coordinator job.
@@ -32,8 +33,7 @@
private String coordJobId = null;
public CoordActionsActiveCountJPAExecutor(String coordJobId) {
- ParamChecker.notNull(coordJobId, "coordJobId");
- this.coordJobId = coordJobId;
+ this.coordJobId = Objects.requireNonNull(coordJobId, "coordJobId cannot be null");
}
@Override
diff --git a/core/src/main/java/org/apache/oozie/executor/jpa/CoordActionsCountForJobIdJPAExecutor.java b/core/src/main/java/org/apache/oozie/executor/jpa/CoordActionsCountForJobIdJPAExecutor.java
index f49848f..2df240e 100644
--- a/core/src/main/java/org/apache/oozie/executor/jpa/CoordActionsCountForJobIdJPAExecutor.java
+++ b/core/src/main/java/org/apache/oozie/executor/jpa/CoordActionsCountForJobIdJPAExecutor.java
@@ -25,10 +25,10 @@
import org.apache.oozie.CoordinatorEngine.FILTER_COMPARATORS;
import org.apache.oozie.ErrorCode;
import org.apache.oozie.util.Pair;
-import org.apache.oozie.util.ParamChecker;
import java.util.List;
import java.util.Map;
+import java.util.Objects;
/**
* Load the number of running actions for a coordinator job.
@@ -39,7 +39,7 @@
private Map<Pair<String, FILTER_COMPARATORS>, List<Object>> filterMap;
public CoordActionsCountForJobIdJPAExecutor(String coordJobId, Map<Pair<String, FILTER_COMPARATORS>, List<Object>> filterMap) {
- ParamChecker.notNull(coordJobId, "coordJobId");
+ Objects.requireNonNull(coordJobId, "coordJobId cannot be null");
this.coordJobId = coordJobId;
this.filterMap = filterMap;
}
diff --git a/core/src/main/java/org/apache/oozie/executor/jpa/CoordActionsPendingFalseCountGetJPAExecutor.java b/core/src/main/java/org/apache/oozie/executor/jpa/CoordActionsPendingFalseCountGetJPAExecutor.java
index e427835..e15119b 100644
--- a/core/src/main/java/org/apache/oozie/executor/jpa/CoordActionsPendingFalseCountGetJPAExecutor.java
+++ b/core/src/main/java/org/apache/oozie/executor/jpa/CoordActionsPendingFalseCountGetJPAExecutor.java
@@ -22,7 +22,8 @@
import javax.persistence.Query;
import org.apache.oozie.ErrorCode;
-import org.apache.oozie.util.ParamChecker;
+
+import java.util.Objects;
/**
* Load the number of pending actions for a coordinator job.
@@ -32,7 +33,7 @@
private String coordJobId = null;
public CoordActionsPendingFalseCountGetJPAExecutor(String coordJobId) {
- ParamChecker.notNull(coordJobId, "coordJobId");
+ Objects.requireNonNull(coordJobId, "coordJobId cannot be null");
this.coordJobId = coordJobId;
}
diff --git a/core/src/main/java/org/apache/oozie/executor/jpa/CoordActionsPendingFalseStatusCountGetJPAExecutor.java b/core/src/main/java/org/apache/oozie/executor/jpa/CoordActionsPendingFalseStatusCountGetJPAExecutor.java
index b32ea6e..5341e5d 100644
--- a/core/src/main/java/org/apache/oozie/executor/jpa/CoordActionsPendingFalseStatusCountGetJPAExecutor.java
+++ b/core/src/main/java/org/apache/oozie/executor/jpa/CoordActionsPendingFalseStatusCountGetJPAExecutor.java
@@ -22,7 +22,8 @@
import javax.persistence.Query;
import org.apache.oozie.ErrorCode;
-import org.apache.oozie.util.ParamChecker;
+
+import java.util.Objects;
/**
* Load the number of pending actions for a status for a coordinator job.
@@ -33,10 +34,8 @@
private String status = null;
public CoordActionsPendingFalseStatusCountGetJPAExecutor(String coordJobId, String status) {
- ParamChecker.notNull(coordJobId, "coordJobId");
- ParamChecker.notNull(status, "status");
- this.coordJobId = coordJobId;
- this.status = status;
+ this.coordJobId = Objects.requireNonNull(coordJobId, "coordJobId cannot be null");
+ this.status = Objects.requireNonNull(status, "status cannot be null");
}
@Override
diff --git a/core/src/main/java/org/apache/oozie/executor/jpa/CoordJobGetActionByActionNumberJPAExecutor.java b/core/src/main/java/org/apache/oozie/executor/jpa/CoordJobGetActionByActionNumberJPAExecutor.java
index 49eb158..c27c680 100644
--- a/core/src/main/java/org/apache/oozie/executor/jpa/CoordJobGetActionByActionNumberJPAExecutor.java
+++ b/core/src/main/java/org/apache/oozie/executor/jpa/CoordJobGetActionByActionNumberJPAExecutor.java
@@ -22,7 +22,8 @@
import javax.persistence.Query;
import org.apache.oozie.ErrorCode;
-import org.apache.oozie.util.ParamChecker;
+
+import java.util.Objects;
/**
* Load the CoordinatorJob into a Bean and return it.
@@ -33,8 +34,7 @@
private final int actionNumber;
public CoordJobGetActionByActionNumberJPAExecutor(String coordJobId, int actionNumber) {
- ParamChecker.notNull(coordJobId, "coordJobId");
- this.coordJobId = coordJobId;
+ this.coordJobId = Objects.requireNonNull(coordJobId, "coordJobId cannot be null");
this.actionNumber = actionNumber;
}
diff --git a/core/src/main/java/org/apache/oozie/executor/jpa/CoordJobGetActionForNominalTimeJPAExecutor.java b/core/src/main/java/org/apache/oozie/executor/jpa/CoordJobGetActionForNominalTimeJPAExecutor.java
index 9a447b0..9a122ba 100644
--- a/core/src/main/java/org/apache/oozie/executor/jpa/CoordJobGetActionForNominalTimeJPAExecutor.java
+++ b/core/src/main/java/org/apache/oozie/executor/jpa/CoordJobGetActionForNominalTimeJPAExecutor.java
@@ -21,6 +21,7 @@
import java.sql.Timestamp;
import java.util.Date;
import java.util.List;
+import java.util.Objects;
import javax.persistence.EntityManager;
import javax.persistence.Query;
@@ -28,7 +29,6 @@
import org.apache.oozie.CoordinatorActionBean;
import org.apache.oozie.ErrorCode;
import org.apache.oozie.util.DateUtils;
-import org.apache.oozie.util.ParamChecker;
/**
* Load coordinator action by nominal time.
@@ -39,8 +39,7 @@
private Date nominalTime = null;
public CoordJobGetActionForNominalTimeJPAExecutor(String jobId, Date nominalTime) {
- ParamChecker.notNull(jobId, "jobId");
- this.jobId = jobId;
+ this.jobId = Objects.requireNonNull(jobId, "jobId cannot be null");
this.nominalTime = nominalTime;
}
diff --git a/core/src/main/java/org/apache/oozie/executor/jpa/CoordJobGetActionModifiedDateForRangeJPAExecutor.java b/core/src/main/java/org/apache/oozie/executor/jpa/CoordJobGetActionModifiedDateForRangeJPAExecutor.java
index 2177514..806153b 100644
--- a/core/src/main/java/org/apache/oozie/executor/jpa/CoordJobGetActionModifiedDateForRangeJPAExecutor.java
+++ b/core/src/main/java/org/apache/oozie/executor/jpa/CoordJobGetActionModifiedDateForRangeJPAExecutor.java
@@ -22,13 +22,13 @@
import java.sql.Timestamp;
import java.util.Date;
import java.util.List;
+import java.util.Objects;
import javax.persistence.EntityManager;
import javax.persistence.Query;
import org.apache.oozie.ErrorCode;
import org.apache.oozie.util.DateUtils;
-import org.apache.oozie.util.ParamChecker;
public class CoordJobGetActionModifiedDateForRangeJPAExecutor implements JPAExecutor<Date> {
@@ -36,8 +36,7 @@
private String startAction, endAction;
public CoordJobGetActionModifiedDateForRangeJPAExecutor(String jobId, String startAction, String endAction) {
- ParamChecker.notNull(jobId, "jobId");
- this.jobId = jobId;
+ this.jobId = Objects.requireNonNull(jobId, "jobId cannot be null");
this.startAction = startAction;
this.endAction = endAction;
}
diff --git a/core/src/main/java/org/apache/oozie/executor/jpa/CoordJobGetActionRunningCountForRangeJPAExecutor.java b/core/src/main/java/org/apache/oozie/executor/jpa/CoordJobGetActionRunningCountForRangeJPAExecutor.java
index 34223bb..5fb0ace 100644
--- a/core/src/main/java/org/apache/oozie/executor/jpa/CoordJobGetActionRunningCountForRangeJPAExecutor.java
+++ b/core/src/main/java/org/apache/oozie/executor/jpa/CoordJobGetActionRunningCountForRangeJPAExecutor.java
@@ -21,7 +21,8 @@
import javax.persistence.EntityManager;
import javax.persistence.Query;
import org.apache.oozie.ErrorCode;
-import org.apache.oozie.util.ParamChecker;
+
+import java.util.Objects;
public class CoordJobGetActionRunningCountForRangeJPAExecutor implements JPAExecutor<Long> {
@@ -29,8 +30,7 @@
private String startAction, endAction;
public CoordJobGetActionRunningCountForRangeJPAExecutor(String jobId, String startAction, String endAction) {
- ParamChecker.notNull(jobId, "jobId");
- this.jobId = jobId;
+ this.jobId = Objects.requireNonNull(jobId, "jobId cannot be null");
this.startAction = startAction;
this.endAction = endAction;
}
diff --git a/core/src/main/java/org/apache/oozie/executor/jpa/CoordJobGetActionsJPAExecutor.java b/core/src/main/java/org/apache/oozie/executor/jpa/CoordJobGetActionsJPAExecutor.java
index 4fb7abb..5dc2333 100644
--- a/core/src/main/java/org/apache/oozie/executor/jpa/CoordJobGetActionsJPAExecutor.java
+++ b/core/src/main/java/org/apache/oozie/executor/jpa/CoordJobGetActionsJPAExecutor.java
@@ -20,13 +20,13 @@
import java.util.ArrayList;
import java.util.List;
+import java.util.Objects;
import javax.persistence.EntityManager;
import javax.persistence.Query;
import org.apache.oozie.CoordinatorActionBean;
import org.apache.oozie.ErrorCode;
-import org.apache.oozie.util.ParamChecker;
/**
* Load coordinator actions for a coordinator job.
@@ -36,8 +36,7 @@
private String coordJobId = null;
public CoordJobGetActionsJPAExecutor(String coordJobId) {
- ParamChecker.notNull(coordJobId, "coordJobId");
- this.coordJobId = coordJobId;
+ this.coordJobId = Objects.requireNonNull(coordJobId, "coordJobId cannot be null");
}
@Override
diff --git a/core/src/main/java/org/apache/oozie/executor/jpa/CoordJobGetActionsNotCompletedJPAExecutor.java b/core/src/main/java/org/apache/oozie/executor/jpa/CoordJobGetActionsNotCompletedJPAExecutor.java
index af0c0a3..dd4a28c 100644
--- a/core/src/main/java/org/apache/oozie/executor/jpa/CoordJobGetActionsNotCompletedJPAExecutor.java
+++ b/core/src/main/java/org/apache/oozie/executor/jpa/CoordJobGetActionsNotCompletedJPAExecutor.java
@@ -21,6 +21,7 @@
import java.sql.Timestamp;
import java.util.ArrayList;
import java.util.List;
+import java.util.Objects;
import javax.persistence.EntityManager;
import javax.persistence.Query;
@@ -30,7 +31,6 @@
import org.apache.oozie.StringBlob;
import org.apache.oozie.client.CoordinatorAction;
import org.apache.oozie.util.DateUtils;
-import org.apache.oozie.util.ParamChecker;
/**
* Load the Coordinator actions which are not completed for a given Coordinator job
@@ -40,8 +40,7 @@
private String coordJobId = null;
public CoordJobGetActionsNotCompletedJPAExecutor(String coordJobId) {
- ParamChecker.notNull(coordJobId, "coordJobId");
- this.coordJobId = coordJobId;
+ this.coordJobId = Objects.requireNonNull(coordJobId, "coordJobId cannot be null");
}
@Override
diff --git a/core/src/main/java/org/apache/oozie/executor/jpa/CoordJobGetActionsRunningJPAExecutor.java b/core/src/main/java/org/apache/oozie/executor/jpa/CoordJobGetActionsRunningJPAExecutor.java
index b001931..be2bd96 100644
--- a/core/src/main/java/org/apache/oozie/executor/jpa/CoordJobGetActionsRunningJPAExecutor.java
+++ b/core/src/main/java/org/apache/oozie/executor/jpa/CoordJobGetActionsRunningJPAExecutor.java
@@ -21,6 +21,7 @@
import java.sql.Timestamp;
import java.util.ArrayList;
import java.util.List;
+import java.util.Objects;
import javax.persistence.EntityManager;
import javax.persistence.Query;
@@ -31,7 +32,6 @@
import org.apache.oozie.client.CoordinatorAction;
import org.apache.oozie.client.Job.Status;
import org.apache.oozie.util.DateUtils;
-import org.apache.oozie.util.ParamChecker;
/**
* Load the running Coordinator actions for a given Coordinator job
@@ -41,8 +41,7 @@
private String coordJobId = null;
public CoordJobGetActionsRunningJPAExecutor(String coordJobId) {
- ParamChecker.notNull(coordJobId, "coordJobId");
- this.coordJobId = coordJobId;
+ this.coordJobId = Objects.requireNonNull(coordJobId, "coordJobId cannot be null");
}
@Override
diff --git a/core/src/main/java/org/apache/oozie/executor/jpa/CoordJobGetActionsStatusJPAExecutor.java b/core/src/main/java/org/apache/oozie/executor/jpa/CoordJobGetActionsStatusJPAExecutor.java
index 073461f..8d13eda 100644
--- a/core/src/main/java/org/apache/oozie/executor/jpa/CoordJobGetActionsStatusJPAExecutor.java
+++ b/core/src/main/java/org/apache/oozie/executor/jpa/CoordJobGetActionsStatusJPAExecutor.java
@@ -20,13 +20,13 @@
import java.util.ArrayList;
import java.util.List;
+import java.util.Objects;
import javax.persistence.EntityManager;
import javax.persistence.Query;
import org.apache.oozie.ErrorCode;
import org.apache.oozie.client.CoordinatorAction;
-import org.apache.oozie.util.ParamChecker;
/**
* Get the status of Coordinator actions for a given Coordinator job
@@ -36,8 +36,7 @@
private String coordJobId = null;
public CoordJobGetActionsStatusJPAExecutor(String coordJobId) {
- ParamChecker.notNull(coordJobId, "coordJobId");
- this.coordJobId = coordJobId;
+ this.coordJobId = Objects.requireNonNull(coordJobId, "coordJobId cannot be null");
}
@Override
diff --git a/core/src/main/java/org/apache/oozie/executor/jpa/CoordJobGetActionsSubsetJPAExecutor.java b/core/src/main/java/org/apache/oozie/executor/jpa/CoordJobGetActionsSubsetJPAExecutor.java
index 9db9daa..481d19f 100644
--- a/core/src/main/java/org/apache/oozie/executor/jpa/CoordJobGetActionsSubsetJPAExecutor.java
+++ b/core/src/main/java/org/apache/oozie/executor/jpa/CoordJobGetActionsSubsetJPAExecutor.java
@@ -27,7 +27,6 @@
import org.apache.oozie.service.Services;
import org.apache.oozie.util.DateUtils;
import org.apache.oozie.util.Pair;
-import org.apache.oozie.util.ParamChecker;
import javax.persistence.EntityManager;
import javax.persistence.Query;
@@ -35,6 +34,7 @@
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
+import java.util.Objects;
/**
* Load coordinator actions by offset and len (a subset) for a coordinator job.
@@ -48,7 +48,7 @@
private Map<Pair<String, FILTER_COMPARATORS>, List<Object>> filterMap;
public CoordJobGetActionsSubsetJPAExecutor(String coordJobId) {
- ParamChecker.notNull(coordJobId, "coordJobId");
+ Objects.requireNonNull(coordJobId, "coordJobId cannot be null");
this.coordJobId = coordJobId;
}
diff --git a/core/src/main/java/org/apache/oozie/executor/jpa/CoordJobGetActionsSuspendedJPAExecutor.java b/core/src/main/java/org/apache/oozie/executor/jpa/CoordJobGetActionsSuspendedJPAExecutor.java
index c70f0d2..c3deb4d 100644
--- a/core/src/main/java/org/apache/oozie/executor/jpa/CoordJobGetActionsSuspendedJPAExecutor.java
+++ b/core/src/main/java/org/apache/oozie/executor/jpa/CoordJobGetActionsSuspendedJPAExecutor.java
@@ -21,6 +21,7 @@
import java.sql.Timestamp;
import java.util.ArrayList;
import java.util.List;
+import java.util.Objects;
import javax.persistence.EntityManager;
import javax.persistence.Query;
@@ -29,7 +30,6 @@
import org.apache.oozie.ErrorCode;
import org.apache.oozie.client.CoordinatorAction;
import org.apache.oozie.util.DateUtils;
-import org.apache.oozie.util.ParamChecker;
/**
* Load the suspended Coordinator actions of a given Coordinator job
@@ -39,8 +39,7 @@
private String coordJobId = null;
public CoordJobGetActionsSuspendedJPAExecutor(String coordJobId) {
- ParamChecker.notNull(coordJobId, "coordJobId");
- this.coordJobId = coordJobId;
+ this.coordJobId = Objects.requireNonNull(coordJobId, "coordJobId cannot be null");
}
@Override
diff --git a/core/src/main/java/org/apache/oozie/executor/jpa/CoordJobGetJPAExecutor.java b/core/src/main/java/org/apache/oozie/executor/jpa/CoordJobGetJPAExecutor.java
index 2c21057..4d38852 100644
--- a/core/src/main/java/org/apache/oozie/executor/jpa/CoordJobGetJPAExecutor.java
+++ b/core/src/main/java/org/apache/oozie/executor/jpa/CoordJobGetJPAExecutor.java
@@ -19,13 +19,13 @@
package org.apache.oozie.executor.jpa;
import java.util.List;
+import java.util.Objects;
import javax.persistence.EntityManager;
import javax.persistence.Query;
import org.apache.oozie.CoordinatorJobBean;
import org.apache.oozie.ErrorCode;
-import org.apache.oozie.util.ParamChecker;
/**
* Load the CoordinatorJob into a Bean and return it.
@@ -35,8 +35,7 @@
private String coordJobId = null;
public CoordJobGetJPAExecutor(String coordJobId) {
- ParamChecker.notNull(coordJobId, "coordJobId");
- this.coordJobId = coordJobId;
+ this.coordJobId = Objects.requireNonNull(coordJobId, "coordJobId cannot be null");
}
@Override
diff --git a/core/src/main/java/org/apache/oozie/executor/jpa/CoordJobGetReadyActionsJPAExecutor.java b/core/src/main/java/org/apache/oozie/executor/jpa/CoordJobGetReadyActionsJPAExecutor.java
index 3b1cda2..5f05a32 100644
--- a/core/src/main/java/org/apache/oozie/executor/jpa/CoordJobGetReadyActionsJPAExecutor.java
+++ b/core/src/main/java/org/apache/oozie/executor/jpa/CoordJobGetReadyActionsJPAExecutor.java
@@ -21,6 +21,7 @@
import java.sql.Timestamp;
import java.util.ArrayList;
import java.util.List;
+import java.util.Objects;
import javax.persistence.EntityManager;
import javax.persistence.Query;
@@ -29,7 +30,6 @@
import org.apache.oozie.ErrorCode;
import org.apache.oozie.client.CoordinatorAction;
import org.apache.oozie.util.DateUtils;
-import org.apache.oozie.util.ParamChecker;
/**
* Load coordinator actions in READY state for a coordinator job.
@@ -40,7 +40,7 @@
private String executionOrder = null;
public CoordJobGetReadyActionsJPAExecutor(String coordJobId, String executionOrder) {
- ParamChecker.notNull(coordJobId, "coordJobId");
+ Objects.requireNonNull(coordJobId, "coordJobId cannot be null");
this.coordJobId = coordJobId;
this.executionOrder = executionOrder;
}
diff --git a/core/src/main/java/org/apache/oozie/executor/jpa/CoordJobGetRunningActionsCountJPAExecutor.java b/core/src/main/java/org/apache/oozie/executor/jpa/CoordJobGetRunningActionsCountJPAExecutor.java
index 567df40..f863da9 100644
--- a/core/src/main/java/org/apache/oozie/executor/jpa/CoordJobGetRunningActionsCountJPAExecutor.java
+++ b/core/src/main/java/org/apache/oozie/executor/jpa/CoordJobGetRunningActionsCountJPAExecutor.java
@@ -22,7 +22,8 @@
import javax.persistence.Query;
import org.apache.oozie.ErrorCode;
-import org.apache.oozie.util.ParamChecker;
+
+import java.util.Objects;
/**
* Load the number of running actions for a coordinator job.
@@ -32,8 +33,7 @@
private String coordJobId = null;
public CoordJobGetRunningActionsCountJPAExecutor(String coordJobId) {
- ParamChecker.notNull(coordJobId, "coordJobId");
- this.coordJobId = coordJobId;
+ this.coordJobId = Objects.requireNonNull(coordJobId, "coordJobId cannot be null");
}
@Override
diff --git a/core/src/main/java/org/apache/oozie/executor/jpa/CoordJobInfoGetJPAExecutor.java b/core/src/main/java/org/apache/oozie/executor/jpa/CoordJobInfoGetJPAExecutor.java
index 4c641d7..f427ebe 100644
--- a/core/src/main/java/org/apache/oozie/executor/jpa/CoordJobInfoGetJPAExecutor.java
+++ b/core/src/main/java/org/apache/oozie/executor/jpa/CoordJobInfoGetJPAExecutor.java
@@ -22,6 +22,7 @@
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
+import java.util.Objects;
import javax.persistence.EntityManager;
import javax.persistence.Query;
@@ -31,7 +32,6 @@
import org.apache.oozie.client.Job.Status;
import org.apache.oozie.client.CoordinatorJob.Timeunit;
import org.apache.oozie.store.StoreStatusFilter;
-import org.apache.oozie.util.ParamChecker;
import org.apache.openjpa.persistence.OpenJPAPersistence;
import org.apache.openjpa.persistence.OpenJPAQuery;
import org.apache.openjpa.persistence.jdbc.FetchDirection;
@@ -50,7 +50,7 @@
private int len = 50;
public CoordJobInfoGetJPAExecutor(Map<String, List<String>> filter, int start, int len) {
- ParamChecker.notNull(filter, "filter");
+ Objects.requireNonNull(filter, "filter cannot be null");
this.filter = filter;
this.start = start;
this.len = len;
diff --git a/core/src/main/java/org/apache/oozie/executor/jpa/CoordJobInsertJPAExecutor.java b/core/src/main/java/org/apache/oozie/executor/jpa/CoordJobInsertJPAExecutor.java
index c26bc69..704905f 100644
--- a/core/src/main/java/org/apache/oozie/executor/jpa/CoordJobInsertJPAExecutor.java
+++ b/core/src/main/java/org/apache/oozie/executor/jpa/CoordJobInsertJPAExecutor.java
@@ -21,7 +21,8 @@
import javax.persistence.EntityManager;
import org.apache.oozie.CoordinatorJobBean;
-import org.apache.oozie.util.ParamChecker;
+
+import java.util.Objects;
/**
* Persist the CoordinatorJob bean.
@@ -31,7 +32,7 @@
private CoordinatorJobBean coordJob = null;
public CoordJobInsertJPAExecutor(CoordinatorJobBean coordJob) {
- ParamChecker.notNull(coordJob, "coordJob");
+ Objects.requireNonNull(coordJob, "coordJob cannot be null");
this.coordJob = coordJob;
}
diff --git a/core/src/main/java/org/apache/oozie/executor/jpa/CoordJobsToBeMaterializedJPAExecutor.java b/core/src/main/java/org/apache/oozie/executor/jpa/CoordJobsToBeMaterializedJPAExecutor.java
index 6c78bd1..b61dba4 100644
--- a/core/src/main/java/org/apache/oozie/executor/jpa/CoordJobsToBeMaterializedJPAExecutor.java
+++ b/core/src/main/java/org/apache/oozie/executor/jpa/CoordJobsToBeMaterializedJPAExecutor.java
@@ -22,13 +22,13 @@
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
+import java.util.Objects;
import javax.persistence.EntityManager;
import javax.persistence.Query;
import org.apache.oozie.CoordinatorJobBean;
import org.apache.oozie.ErrorCode;
-import org.apache.oozie.util.ParamChecker;
/**
* JPA command to get coordinator jobs which are qualify for Materialization.
@@ -43,8 +43,7 @@
* @param limit limit
*/
public CoordJobsToBeMaterializedJPAExecutor(Date date, int limit) {
- ParamChecker.notNull(date, "Coord Job Materialization Date");
- this.dateInput = date;
+ this.dateInput = Objects.requireNonNull(date, "Coord Job Materialization Date cannot be null");
this.limit = limit;
}
diff --git a/core/src/main/java/org/apache/oozie/executor/jpa/CoordinatorJobGetForUserAppnameJPAExecutor.java b/core/src/main/java/org/apache/oozie/executor/jpa/CoordinatorJobGetForUserAppnameJPAExecutor.java
index 42505ea..3b97128 100644
--- a/core/src/main/java/org/apache/oozie/executor/jpa/CoordinatorJobGetForUserAppnameJPAExecutor.java
+++ b/core/src/main/java/org/apache/oozie/executor/jpa/CoordinatorJobGetForUserAppnameJPAExecutor.java
@@ -23,9 +23,10 @@
import org.apache.oozie.CoordinatorJobBean;
import org.apache.oozie.ErrorCode;
-import org.apache.oozie.util.ParamChecker;
import org.apache.oozie.util.XLog;
+import java.util.Objects;
+
/**
* DB query executor to fetch columns 'user' and 'appName' from Coordinator Job table
*/
@@ -34,7 +35,7 @@
private String coordJobId = null;
public CoordinatorJobGetForUserAppnameJPAExecutor(String coordJobId) {
- ParamChecker.notNull(coordJobId, "coordJobId");
+ Objects.requireNonNull(coordJobId, "coordJobId cannot be null");
this.coordJobId = coordJobId;
}
diff --git a/core/src/main/java/org/apache/oozie/executor/jpa/CoordinatorJobGetForUserJPAExecutor.java b/core/src/main/java/org/apache/oozie/executor/jpa/CoordinatorJobGetForUserJPAExecutor.java
index 58f5393..04bce2f 100644
--- a/core/src/main/java/org/apache/oozie/executor/jpa/CoordinatorJobGetForUserJPAExecutor.java
+++ b/core/src/main/java/org/apache/oozie/executor/jpa/CoordinatorJobGetForUserJPAExecutor.java
@@ -22,7 +22,8 @@
import javax.persistence.Query;
import org.apache.oozie.ErrorCode;
-import org.apache.oozie.util.ParamChecker;
+
+import java.util.Objects;
/**
* Retrieve the name of user submitting coordinator
@@ -33,8 +34,7 @@
private String wfJobId = null;
public CoordinatorJobGetForUserJPAExecutor(String wfJobId) {
- ParamChecker.notNull(wfJobId, "wfJobId");
- this.wfJobId = wfJobId;
+ this.wfJobId = Objects.requireNonNull(wfJobId, "wfJobId cannot be null");
}
@Override
diff --git a/core/src/main/java/org/apache/oozie/executor/jpa/SLAEventInsertJPAExecutor.java b/core/src/main/java/org/apache/oozie/executor/jpa/SLAEventInsertJPAExecutor.java
index 8955419..08a32df 100644
--- a/core/src/main/java/org/apache/oozie/executor/jpa/SLAEventInsertJPAExecutor.java
+++ b/core/src/main/java/org/apache/oozie/executor/jpa/SLAEventInsertJPAExecutor.java
@@ -21,7 +21,8 @@
import javax.persistence.EntityManager;
import org.apache.oozie.SLAEventBean;
-import org.apache.oozie.util.ParamChecker;
+
+import java.util.Objects;
/**
* Persist the SLAEventBean bean.
@@ -32,7 +33,7 @@
private SLAEventBean slaEvent = null;
public SLAEventInsertJPAExecutor(SLAEventBean slaEvent) {
- ParamChecker.notNull(slaEvent, "slaEvent");
+ Objects.requireNonNull(slaEvent, "slaEvent cannot be null");
this.slaEvent = slaEvent;
}
diff --git a/core/src/main/java/org/apache/oozie/executor/jpa/WorkflowActionGetJPAExecutor.java b/core/src/main/java/org/apache/oozie/executor/jpa/WorkflowActionGetJPAExecutor.java
index 1c7a14b..cdf3570 100644
--- a/core/src/main/java/org/apache/oozie/executor/jpa/WorkflowActionGetJPAExecutor.java
+++ b/core/src/main/java/org/apache/oozie/executor/jpa/WorkflowActionGetJPAExecutor.java
@@ -19,13 +19,13 @@
package org.apache.oozie.executor.jpa;
import java.util.List;
+import java.util.Objects;
import javax.persistence.EntityManager;
import javax.persistence.Query;
import org.apache.oozie.ErrorCode;
import org.apache.oozie.WorkflowActionBean;
-import org.apache.oozie.util.ParamChecker;
import org.apache.oozie.util.XLog;
/**
@@ -43,8 +43,7 @@
}
public WorkflowActionGetJPAExecutor(String wfActionId, boolean isNullAcceptable) {
- ParamChecker.notNull(wfActionId, "wfActionId");
- this.wfActionId = wfActionId;
+ this.wfActionId = Objects.requireNonNull(wfActionId, "wfActionId cannot be null");
this.isNullAcceptable = isNullAcceptable;
}
diff --git a/core/src/main/java/org/apache/oozie/executor/jpa/WorkflowActionInsertJPAExecutor.java b/core/src/main/java/org/apache/oozie/executor/jpa/WorkflowActionInsertJPAExecutor.java
index 637f2e0..dc1025d 100644
--- a/core/src/main/java/org/apache/oozie/executor/jpa/WorkflowActionInsertJPAExecutor.java
+++ b/core/src/main/java/org/apache/oozie/executor/jpa/WorkflowActionInsertJPAExecutor.java
@@ -21,7 +21,8 @@
import javax.persistence.EntityManager;
import org.apache.oozie.WorkflowActionBean;
-import org.apache.oozie.util.ParamChecker;
+
+import java.util.Objects;
/**
* Persist the WorkflowAction bean.
@@ -31,8 +32,7 @@
private WorkflowActionBean wfAction = null;
public WorkflowActionInsertJPAExecutor(WorkflowActionBean wfAction) {
- ParamChecker.notNull(wfAction, "wfAction");
- this.wfAction = wfAction;
+ this.wfAction = Objects.requireNonNull(wfAction, "wfAction cannot be null");
}
@Override
diff --git a/core/src/main/java/org/apache/oozie/executor/jpa/WorkflowActionRetryManualGetJPAExecutor.java b/core/src/main/java/org/apache/oozie/executor/jpa/WorkflowActionRetryManualGetJPAExecutor.java
index 25ad7e2..c0837a8 100644
--- a/core/src/main/java/org/apache/oozie/executor/jpa/WorkflowActionRetryManualGetJPAExecutor.java
+++ b/core/src/main/java/org/apache/oozie/executor/jpa/WorkflowActionRetryManualGetJPAExecutor.java
@@ -19,13 +19,13 @@
package org.apache.oozie.executor.jpa;
import java.util.List;
+import java.util.Objects;
import javax.persistence.EntityManager;
import javax.persistence.Query;
import org.apache.oozie.ErrorCode;
import org.apache.oozie.WorkflowActionBean;
-import org.apache.oozie.util.ParamChecker;
public class WorkflowActionRetryManualGetJPAExecutor implements JPAExecutor<List<WorkflowActionBean>> {
@@ -38,8 +38,7 @@
* @param wfId WF id
*/
public WorkflowActionRetryManualGetJPAExecutor(String wfId) {
- ParamChecker.notNull(wfId, "wfId");
- this.wfId = wfId;
+ this.wfId = Objects.requireNonNull(wfId, "wfId cannot be null");
this.actions = null;
}
diff --git a/core/src/main/java/org/apache/oozie/executor/jpa/WorkflowActionSubsetGetJPAExecutor.java b/core/src/main/java/org/apache/oozie/executor/jpa/WorkflowActionSubsetGetJPAExecutor.java
index 9a8e103..2802aa4 100644
--- a/core/src/main/java/org/apache/oozie/executor/jpa/WorkflowActionSubsetGetJPAExecutor.java
+++ b/core/src/main/java/org/apache/oozie/executor/jpa/WorkflowActionSubsetGetJPAExecutor.java
@@ -21,13 +21,13 @@
import java.sql.SQLException;
import java.util.ArrayList;
import java.util.List;
+import java.util.Objects;
import javax.persistence.EntityManager;
import javax.persistence.Query;
import org.apache.oozie.ErrorCode;
import org.apache.oozie.WorkflowActionBean;
-import org.apache.oozie.util.ParamChecker;
import org.apache.openjpa.persistence.OpenJPAPersistence;
/**
@@ -48,7 +48,7 @@
* @param length length
*/
public WorkflowActionSubsetGetJPAExecutor(String wfId, int start, int length) {
- ParamChecker.notNull(wfId, "wfJobId");
+ Objects.requireNonNull(wfId, "wfJobId cannot be null");
this.wfId = wfId;
this.start = start;
this.length = length;
diff --git a/core/src/main/java/org/apache/oozie/executor/jpa/WorkflowActionsGetForJobJPAExecutor.java b/core/src/main/java/org/apache/oozie/executor/jpa/WorkflowActionsGetForJobJPAExecutor.java
index 2f012a4..c7d2a34 100644
--- a/core/src/main/java/org/apache/oozie/executor/jpa/WorkflowActionsGetForJobJPAExecutor.java
+++ b/core/src/main/java/org/apache/oozie/executor/jpa/WorkflowActionsGetForJobJPAExecutor.java
@@ -21,13 +21,13 @@
import java.sql.SQLException;
import java.util.ArrayList;
import java.util.List;
+import java.util.Objects;
import javax.persistence.EntityManager;
import javax.persistence.Query;
import org.apache.oozie.ErrorCode;
import org.apache.oozie.WorkflowActionBean;
-import org.apache.oozie.util.ParamChecker;
/**
* Load the list of WorkflowAction for a WorkflowJob and return the list.
@@ -37,7 +37,7 @@
private String wfJobId = null;
public WorkflowActionsGetForJobJPAExecutor(String wfJobId) {
- ParamChecker.notNull(wfJobId, "wfJobId");
+ Objects.requireNonNull(wfJobId, "wfJobId cannot be null");
this.wfJobId = wfJobId;
}
diff --git a/core/src/main/java/org/apache/oozie/executor/jpa/WorkflowIdGetForExternalIdJPAExecutor.java b/core/src/main/java/org/apache/oozie/executor/jpa/WorkflowIdGetForExternalIdJPAExecutor.java
index b0c9259..a4879a3 100644
--- a/core/src/main/java/org/apache/oozie/executor/jpa/WorkflowIdGetForExternalIdJPAExecutor.java
+++ b/core/src/main/java/org/apache/oozie/executor/jpa/WorkflowIdGetForExternalIdJPAExecutor.java
@@ -19,12 +19,11 @@
package org.apache.oozie.executor.jpa;
import java.util.List;
+import java.util.Objects;
import javax.persistence.EntityManager;
import javax.persistence.Query;
-import org.apache.oozie.util.ParamChecker;
-
/**
* Get the Workflow ID with given external ID which will be assigned for the subworkflows.
*/
@@ -33,8 +32,7 @@
private String externalId = null;
public WorkflowIdGetForExternalIdJPAExecutor(String externalId) {
- ParamChecker.notNull(externalId, "externalId");
- this.externalId = externalId;
+ this.externalId = Objects.requireNonNull(externalId, "externalId cannot be null");
}
@Override
diff --git a/core/src/main/java/org/apache/oozie/executor/jpa/WorkflowInfoWithActionsSubsetGetJPAExecutor.java b/core/src/main/java/org/apache/oozie/executor/jpa/WorkflowInfoWithActionsSubsetGetJPAExecutor.java
index 5df6841..a7f2d01 100644
--- a/core/src/main/java/org/apache/oozie/executor/jpa/WorkflowInfoWithActionsSubsetGetJPAExecutor.java
+++ b/core/src/main/java/org/apache/oozie/executor/jpa/WorkflowInfoWithActionsSubsetGetJPAExecutor.java
@@ -19,6 +19,7 @@
package org.apache.oozie.executor.jpa;
import java.util.List;
+import java.util.Objects;
import javax.persistence.EntityManager;
@@ -28,7 +29,6 @@
import org.apache.oozie.command.CommandException;
import org.apache.oozie.service.JPAService;
import org.apache.oozie.service.Services;
-import org.apache.oozie.util.ParamChecker;
/**
* This JPA Executor is responsible for getting the Workflow job with actions in certain range.
@@ -49,7 +49,7 @@
* @param len length of range
*/
public WorkflowInfoWithActionsSubsetGetJPAExecutor(String wfJobId, int start, int len) {
- ParamChecker.notNull(wfJobId, "wfJobId");
+ Objects.requireNonNull(wfJobId, "wfJobId cannot be null");
this.wfJobId = wfJobId;
this.start = start;
this.len = len;
diff --git a/core/src/main/java/org/apache/oozie/executor/jpa/WorkflowJobGetActionsJPAExecutor.java b/core/src/main/java/org/apache/oozie/executor/jpa/WorkflowJobGetActionsJPAExecutor.java
index cd8586e..9bff362 100644
--- a/core/src/main/java/org/apache/oozie/executor/jpa/WorkflowJobGetActionsJPAExecutor.java
+++ b/core/src/main/java/org/apache/oozie/executor/jpa/WorkflowJobGetActionsJPAExecutor.java
@@ -19,13 +19,13 @@
package org.apache.oozie.executor.jpa;
import java.util.List;
+import java.util.Objects;
import javax.persistence.EntityManager;
import javax.persistence.Query;
import org.apache.oozie.ErrorCode;
import org.apache.oozie.WorkflowActionBean;
-import org.apache.oozie.util.ParamChecker;
/**
* Load workflow actions for a workflow job.
@@ -35,7 +35,7 @@
private String wfJobId = null;
public WorkflowJobGetActionsJPAExecutor(String wfJobId) {
- ParamChecker.notNull(wfJobId, "wfJobId");
+ Objects.requireNonNull(wfJobId, "wfJobId cannot be null");
this.wfJobId = wfJobId;
}
diff --git a/core/src/main/java/org/apache/oozie/executor/jpa/WorkflowJobGetForUserJPAExecutor.java b/core/src/main/java/org/apache/oozie/executor/jpa/WorkflowJobGetForUserJPAExecutor.java
index 7233bca..680ac3b 100644
--- a/core/src/main/java/org/apache/oozie/executor/jpa/WorkflowJobGetForUserJPAExecutor.java
+++ b/core/src/main/java/org/apache/oozie/executor/jpa/WorkflowJobGetForUserJPAExecutor.java
@@ -22,7 +22,8 @@
import javax.persistence.Query;
import org.apache.oozie.ErrorCode;
-import org.apache.oozie.util.ParamChecker;
+
+import java.util.Objects;
/**
*
@@ -33,8 +34,7 @@
private String wfJobId = null;
public WorkflowJobGetForUserJPAExecutor(String wfJobId) {
- ParamChecker.notNull(wfJobId, "wfJobId");
- this.wfJobId = wfJobId;
+ this.wfJobId = Objects.requireNonNull(wfJobId, "wfJobId cannot be null");
}
@Override
diff --git a/core/src/main/java/org/apache/oozie/executor/jpa/WorkflowJobGetJPAExecutor.java b/core/src/main/java/org/apache/oozie/executor/jpa/WorkflowJobGetJPAExecutor.java
index 54350f4..491f7ee 100644
--- a/core/src/main/java/org/apache/oozie/executor/jpa/WorkflowJobGetJPAExecutor.java
+++ b/core/src/main/java/org/apache/oozie/executor/jpa/WorkflowJobGetJPAExecutor.java
@@ -19,13 +19,13 @@
package org.apache.oozie.executor.jpa;
import java.util.List;
+import java.util.Objects;
import javax.persistence.EntityManager;
import javax.persistence.Query;
import org.apache.oozie.ErrorCode;
import org.apache.oozie.WorkflowJobBean;
-import org.apache.oozie.util.ParamChecker;
/**
* Load the WorkflowJob into a Bean and return it.
@@ -35,8 +35,7 @@
private String wfJobId = null;
public WorkflowJobGetJPAExecutor(String wfJobId) {
- ParamChecker.notNull(wfJobId, "wfJobId");
- this.wfJobId = wfJobId;
+ this.wfJobId = Objects.requireNonNull(wfJobId, "wfJobId cannot be null");
}
@Override
diff --git a/core/src/main/java/org/apache/oozie/executor/jpa/WorkflowJobInsertJPAExecutor.java b/core/src/main/java/org/apache/oozie/executor/jpa/WorkflowJobInsertJPAExecutor.java
index 0816c27..448e360 100644
--- a/core/src/main/java/org/apache/oozie/executor/jpa/WorkflowJobInsertJPAExecutor.java
+++ b/core/src/main/java/org/apache/oozie/executor/jpa/WorkflowJobInsertJPAExecutor.java
@@ -21,7 +21,8 @@
import javax.persistence.EntityManager;
import org.apache.oozie.WorkflowJobBean;
-import org.apache.oozie.util.ParamChecker;
+
+import java.util.Objects;
/**
* Persist the WorkflowJob bean.
@@ -31,8 +32,7 @@
private WorkflowJobBean wfJob = null;
public WorkflowJobInsertJPAExecutor(WorkflowJobBean wfJob) {
- ParamChecker.notNull(wfJob, "wfJob");
- this.wfJob = wfJob;
+ this.wfJob = Objects.requireNonNull(wfJob, "wfJob cannot be null");
}
@Override
diff --git a/core/src/main/java/org/apache/oozie/servlet/JsonRestServlet.java b/core/src/main/java/org/apache/oozie/servlet/JsonRestServlet.java
index aca79ba..b216416 100644
--- a/core/src/main/java/org/apache/oozie/servlet/JsonRestServlet.java
+++ b/core/src/main/java/org/apache/oozie/servlet/JsonRestServlet.java
@@ -94,9 +94,9 @@
if (type != Integer.class && type != Boolean.class && type != String.class) {
throw new IllegalArgumentException("Type must be integer, boolean or string");
}
- this.type = ParamChecker.notNull(type, "type");
+ this.type = Objects.requireNonNull(type, "type cannot be null");
this.required = required;
- this.methods = ParamChecker.notNull(methods, "methods");
+ this.methods = Objects.requireNonNull(methods, "methods cannot be null");
}
}
@@ -123,7 +123,7 @@
for (ParameterInfo parameter : parameters) {
this.parameters.put(parameter.name, parameter);
}
- this.methods = ParamChecker.notNull(methods, "methods");
+ this.methods = Objects.requireNonNull(methods, "methods cannot be null");
}
}
diff --git a/core/src/main/java/org/apache/oozie/store/WorkflowStore.java b/core/src/main/java/org/apache/oozie/store/WorkflowStore.java
index a6b38c5..d50b8d1 100644
--- a/core/src/main/java/org/apache/oozie/store/WorkflowStore.java
+++ b/core/src/main/java/org/apache/oozie/store/WorkflowStore.java
@@ -24,6 +24,7 @@
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
+import java.util.Objects;
import java.util.concurrent.Callable;
import javax.persistence.EntityManager;
@@ -72,14 +73,14 @@
public WorkflowStore(Connection connection, boolean selectForUpdate) throws StoreException {
super();
- conn = ParamChecker.notNull(connection, "conn");
+ conn = Objects.requireNonNull(connection, "conn cannot be null");
entityManager = getEntityManager();
this.selectForUpdate = selectForUpdate;
}
public WorkflowStore(Connection connection, Store store, boolean selectForUpdate) throws StoreException {
super(store);
- conn = ParamChecker.notNull(connection, "conn");
+ conn = Objects.requireNonNull(connection, "conn cannot be null");
entityManager = getEntityManager();
this.selectForUpdate = selectForUpdate;
}
@@ -107,7 +108,7 @@
*/
public void insertWorkflow(final WorkflowJobBean workflow) throws StoreException {
- ParamChecker.notNull(workflow, "workflow");
+ Objects.requireNonNull(workflow, "workflow cannot be null");
doOperation("insertWorkflow", new Callable<Void>() {
public Void call() throws SQLException, StoreException, WorkflowException {
@@ -199,7 +200,7 @@
* @throws StoreException If Workflow doesn't exist
*/
public void updateWorkflow(final WorkflowJobBean wfBean) throws StoreException {
- ParamChecker.notNull(wfBean, "WorkflowJobBean");
+ Objects.requireNonNull(wfBean, "WorkflowJobBean cannot be null");
doOperation("updateWorkflow", new Callable<Void>() {
public Void call() throws SQLException, StoreException, WorkflowException, JPAExecutorException {
WorkflowJobQueryExecutor.getInstance().executeUpdate(
@@ -216,7 +217,7 @@
* @throws StoreException If the action is already present
*/
public void insertAction(final WorkflowActionBean action) throws StoreException {
- ParamChecker.notNull(action, "WorkflowActionBean");
+ Objects.requireNonNull(action, "WorkflowActionBean cannot be null");
doOperation("insertAction", new Callable<Void>() {
public Void call() throws SQLException, StoreException, WorkflowException {
entityManager.persist(action);
@@ -273,7 +274,7 @@
* @throws StoreException if action doesn't exist
*/
public void updateAction(final WorkflowActionBean action) throws StoreException {
- ParamChecker.notNull(action, "WorkflowActionBean");
+ Objects.requireNonNull(action, "WorkflowActionBean cannot be null");
doOperation("updateAction", new Callable<Void>() {
public Void call() throws SQLException, StoreException, WorkflowException, JPAExecutorException {
WorkflowActionQueryExecutor.getInstance().executeUpdate(
diff --git a/core/src/main/java/org/apache/oozie/util/ConfigUtils.java b/core/src/main/java/org/apache/oozie/util/ConfigUtils.java
index 895370a..3d6118d 100644
--- a/core/src/main/java/org/apache/oozie/util/ConfigUtils.java
+++ b/core/src/main/java/org/apache/oozie/util/ConfigUtils.java
@@ -18,7 +18,6 @@
package org.apache.oozie.util;
-import com.google.common.base.Preconditions;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.mapreduce.MRJobConfig;
import org.apache.oozie.client.OozieClient;
@@ -26,6 +25,8 @@
import org.apache.oozie.service.StatusTransitService;
import org.apache.oozie.servlet.ServicesLoader;
+import java.util.Objects;
+
/**
*
*/
@@ -150,9 +151,9 @@
final String newValue,
final E toThrow,
final boolean performWrite) throws E {
- Preconditions.checkNotNull(base, "base");
- Preconditions.checkNotNull(newValue, "newValue");
- Preconditions.checkNotNull(toThrow, "toThrow");
+ Objects.requireNonNull(base, "base cannot be null");
+ Objects.requireNonNull(newValue, "newValue cannot be null");
+ Objects.requireNonNull(toThrow, "toThrow cannot be null");
for (final String defaultDisallowedProperty : PropertiesUtils.DEFAULT_DISALLOWED_PROPERTIES) {
checkAndSetConfigValue(base, defaultDisallowedProperty, newValue, toThrow, performWrite);
diff --git a/core/src/main/java/org/apache/oozie/util/FixedJsonInstanceSerializer.java b/core/src/main/java/org/apache/oozie/util/FixedJsonInstanceSerializer.java
index f319fb9..4e3c323 100644
--- a/core/src/main/java/org/apache/oozie/util/FixedJsonInstanceSerializer.java
+++ b/core/src/main/java/org/apache/oozie/util/FixedJsonInstanceSerializer.java
@@ -22,6 +22,7 @@
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
+import java.util.Objects;
import com.fasterxml.jackson.core.JsonParseException;
@@ -29,7 +30,6 @@
import com.fasterxml.jackson.databind.JsonMappingException;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
-import com.google.common.base.Preconditions;
import org.apache.curator.x.discovery.ServiceInstance;
import org.apache.curator.x.discovery.ServiceInstanceBuilder;
import org.apache.curator.x.discovery.ServiceType;
@@ -68,30 +68,30 @@
}
private String getTextField(final JsonNode pNode, final String pFieldName) {
- Preconditions.checkNotNull(pNode);
- Preconditions.checkNotNull(pFieldName);
+ Objects.requireNonNull(pNode, "pNode cannot be null");
+ Objects.requireNonNull(pFieldName, "pFieldName cannot be null");
return pNode.get(pFieldName) != null ? pNode.get(pFieldName).textValue() : null;
}
private Integer getIntegerField(final JsonNode pNode, final String pFieldName) {
- Preconditions.checkNotNull(pNode);
- Preconditions.checkNotNull(pFieldName);
+ Objects.requireNonNull(pNode, "pNode cannot be null");
+ Objects.requireNonNull(pFieldName, "pFieldName cannot be null");
return (pNode.get(pFieldName) != null && pNode.get(pFieldName).isNumber()) ? pNode.get(pFieldName)
.intValue() : null;
}
private Long getLongField(final JsonNode pNode, final String pFieldName) {
- Preconditions.checkNotNull(pNode);
- Preconditions.checkNotNull(pFieldName);
+ Objects.requireNonNull(pNode, "pNode cannot be null");
+ Objects.requireNonNull(pFieldName, "pFieldName cannot be null");
return (pNode.get(pFieldName) != null && pNode.get(pFieldName).isLong()) ? pNode.get(pFieldName).longValue()
: null;
}
private <O> O getObject(final JsonNode pNode, final String pFieldName, final Class<O> pObjectClass)
throws JsonParseException, JsonMappingException, IOException {
- Preconditions.checkNotNull(pNode);
- Preconditions.checkNotNull(pFieldName);
- Preconditions.checkNotNull(pObjectClass);
+ Objects.requireNonNull(pNode, "pNode cannot be null");
+ Objects.requireNonNull(pFieldName, "pFieldName cannot be null");
+ Objects.requireNonNull(pObjectClass, "pObjectClass cannot be null");
if (pNode.get(pFieldName) != null && pNode.get(pFieldName).isObject()) {
return mMapper.readValue(pNode.get(pFieldName).toString(), pObjectClass);
} else {
diff --git a/core/src/main/java/org/apache/oozie/util/IOUtils.java b/core/src/main/java/org/apache/oozie/util/IOUtils.java
index 1ee237b..c8ada2f 100644
--- a/core/src/main/java/org/apache/oozie/util/IOUtils.java
+++ b/core/src/main/java/org/apache/oozie/util/IOUtils.java
@@ -29,6 +29,7 @@
import java.io.FileOutputStream;
import java.io.Closeable;
import java.nio.charset.StandardCharsets;
+import java.util.Objects;
import java.util.zip.ZipOutputStream;
import java.util.zip.ZipEntry;
import java.util.jar.JarOutputStream;
@@ -46,7 +47,7 @@
* @throws IOException thrown if the directory could not be deleted.
*/
public static void delete(File file) throws IOException {
- ParamChecker.notNull(file, "file");
+ Objects.requireNonNull(file, "file cannot be null");
if (file.getAbsolutePath().length() < 5) {
throw new RuntimeException(XLog.format("Path[{0}] is too short, not deleting", file.getAbsolutePath()));
}
@@ -74,7 +75,7 @@
* @throws IOException thrown if the resource could not be read.
*/
public static String getReaderAsString(Reader reader, int maxLen) throws IOException {
- ParamChecker.notNull(reader, "reader");
+ Objects.requireNonNull(reader, "reader cannot be null");
StringBuffer sb = new StringBuffer();
char[] buffer = new char[2048];
int read;
@@ -146,8 +147,8 @@
* @throws IOException thrown if the copy failed.
*/
public static void copyStream(InputStream is, OutputStream os) throws IOException {
- ParamChecker.notNull(is, "is");
- ParamChecker.notNull(os, "os");
+ Objects.requireNonNull(is, "is cannot be null");
+ Objects.requireNonNull(os, "os cannot be null");
byte[] buffer = new byte[4096];
int read;
while ((read = is.read(buffer)) > -1) {
@@ -165,8 +166,8 @@
* @throws IOException thrown if the copy failed.
*/
public static void copyCharStream(Reader reader, Writer writer) throws IOException {
- ParamChecker.notNull(reader, "reader");
- ParamChecker.notNull(writer, "writer");
+ Objects.requireNonNull(reader, "reader cannot be null");
+ Objects.requireNonNull(writer, "writer cannot be null");
char[] buffer = new char[4096];
int read;
while ((read = reader.read(buffer)) > -1) {
diff --git a/core/src/main/java/org/apache/oozie/util/JobUtils.java b/core/src/main/java/org/apache/oozie/util/JobUtils.java
index 721a8a0..f0e2047 100644
--- a/core/src/main/java/org/apache/oozie/util/JobUtils.java
+++ b/core/src/main/java/org/apache/oozie/util/JobUtils.java
@@ -22,6 +22,7 @@
import java.net.URI;
import java.util.HashMap;
import java.util.Map;
+import java.util.Objects;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.filecache.DistributedCache;
@@ -53,7 +54,7 @@
* @throws IOException thrown if normalization can not be done properly.
*/
public static void normalizeAppPath(String user, String group, Configuration conf) throws IOException {
- ParamChecker.notNull(user, "user");
+ Objects.requireNonNull(user, "user cannot be null");
if (conf.get(XOozieClient.IS_PROXY_SUBMISSION) != null) { // do nothing for proxy submission job;
return;
diff --git a/core/src/main/java/org/apache/oozie/util/ParamChecker.java b/core/src/main/java/org/apache/oozie/util/ParamChecker.java
index e86971f..a4e1e66 100644
--- a/core/src/main/java/org/apache/oozie/util/ParamChecker.java
+++ b/core/src/main/java/org/apache/oozie/util/ParamChecker.java
@@ -20,6 +20,7 @@
import java.util.Date;
import java.util.List;
+import java.util.Objects;
import java.util.TimeZone;
import org.apache.commons.lang3.StringUtils;
@@ -34,38 +35,6 @@
private static final int MAX_NODE_NAME_LEN = 128;
/**
- * Check that a value is not null. If null throws an IllegalArgumentException.
- *
- * @param <T> the type of the object
- * @param obj value.
- * @param name parameter name for the exception message.
- * @return the given value.
- */
- public static <T> T notNull(T obj, String name) {
- if (obj == null) {
- throw new IllegalArgumentException(name + " cannot be null");
- }
- return obj;
- }
-
- /**
- * Check that a list is not null and that none of its elements is null. If null or if the list has emtpy elements
- * throws an IllegalArgumentException.
- *
- * @param <T> the type of the list
- * @param list the list of strings.
- * @param name parameter name for the exception message.
- * @return the given list.
- */
- public static <T> List<T> notNullElements(List<T> list, String name) {
- notNull(list, name);
- for (int i = 0; i < list.size(); i++) {
- notNull(list.get(i), XLog.format("list [{0}] element [{1}]", name, i));
- }
- return list;
- }
-
- /**
* Check that a string is not null and not empty. If null or emtpy throws an IllegalArgumentException.
*
* @param str value.
@@ -103,7 +72,7 @@
* @return the given list.
*/
public static List<String> notEmptyElements(List<String> list, String name) {
- notNull(list, name);
+ Objects.requireNonNull(list, () -> String.format("%s cannot be null", name));
for (int i = 0; i < list.size(); i++) {
notEmpty(list.get(i), XLog.format("list [{0}] element [{1}]", name, i));
}
diff --git a/core/src/main/java/org/apache/oozie/util/ParameterVerifier.java b/core/src/main/java/org/apache/oozie/util/ParameterVerifier.java
index ed323a8..5ea3cf4 100644
--- a/core/src/main/java/org/apache/oozie/util/ParameterVerifier.java
+++ b/core/src/main/java/org/apache/oozie/util/ParameterVerifier.java
@@ -19,6 +19,7 @@
package org.apache.oozie.util;
import java.util.Iterator;
+import java.util.Objects;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import org.apache.oozie.ErrorCode;
@@ -46,7 +47,7 @@
* @throws ParameterVerifierException If required parameters are not defined and have no default values, or if a name is empty
*/
public static void verifyParameters(Configuration conf, Element rootElement) throws ParameterVerifierException {
- ParamChecker.notNull(conf, "conf");
+ Objects.requireNonNull(conf, "conf cannot be null");
if (rootElement == null) {
return;
}
diff --git a/core/src/main/java/org/apache/oozie/util/PriorityDelayQueue.java b/core/src/main/java/org/apache/oozie/util/PriorityDelayQueue.java
index 365f918..4c7d31c 100644
--- a/core/src/main/java/org/apache/oozie/util/PriorityDelayQueue.java
+++ b/core/src/main/java/org/apache/oozie/util/PriorityDelayQueue.java
@@ -25,6 +25,7 @@
import java.util.ConcurrentModificationException;
import java.util.Iterator;
import java.util.List;
+import java.util.Objects;
import java.util.concurrent.BlockingQueue;
import java.util.concurrent.DelayQueue;
import java.util.concurrent.Delayed;
@@ -354,7 +355,7 @@
* @throws NullPointerException if the specified element is null
*/
boolean offer(QueueElement<E> queueElement, boolean ignoreSize) {
- ParamChecker.notNull(queueElement, "queueElement");
+ Objects.requireNonNull(queueElement, "queueElement cannot be null");
if (queueElement.getPriority() < 0 || queueElement.getPriority() >= priorities) {
throw new IllegalArgumentException("priority out of range: " + queueElement);
}
diff --git a/core/src/main/java/org/apache/oozie/util/PropertiesUtils.java b/core/src/main/java/org/apache/oozie/util/PropertiesUtils.java
index ec0f687..e5f013d 100644
--- a/core/src/main/java/org/apache/oozie/util/PropertiesUtils.java
+++ b/core/src/main/java/org/apache/oozie/util/PropertiesUtils.java
@@ -18,6 +18,7 @@
package org.apache.oozie.util;
+import java.util.Objects;
import java.util.Properties;
import java.util.Set;
import java.io.StringWriter;
@@ -57,7 +58,7 @@
public static final Set<String> DEFAULT_DISALLOWED_PROPERTIES = ImmutableSet.of(OozieClient.USER_NAME, MRJobConfig.USER_NAME);
public static String propertiesToString(Properties props) {
- ParamChecker.notNull(props, "props");
+ Objects.requireNonNull(props, "props cannot be null");
try {
StringWriter sw = new StringWriter();
props.store(sw, "");
@@ -70,7 +71,7 @@
}
public static Properties stringToProperties(String str) {
- ParamChecker.notNull(str, "str");
+ Objects.requireNonNull(str, "str cannot be null");
try {
StringReader sr = new StringReader(str);
Properties props = new Properties();
@@ -95,7 +96,7 @@
* @param set String set
*/
public static void createPropertySet(String[] properties, Set<String> set) {
- ParamChecker.notNull(set, "set");
+ Objects.requireNonNull(set, "set cannot be null");
for (String p : properties) {
set.add(p);
}
@@ -109,7 +110,7 @@
* @throws CommandException if a property in the set is not null in the conf
*/
public static void checkDisallowedProperties(Configuration conf, Set<String> set) throws CommandException {
- ParamChecker.notNull(conf, "conf");
+ Objects.requireNonNull(conf, "conf cannot be null");
for (String prop : set) {
if (conf.get(prop) != null) {
throw new CommandException(ErrorCode.E0808, prop);
diff --git a/core/src/main/java/org/apache/oozie/util/XmlUtils.java b/core/src/main/java/org/apache/oozie/util/XmlUtils.java
index 41a8281..081d709 100644
--- a/core/src/main/java/org/apache/oozie/util/XmlUtils.java
+++ b/core/src/main/java/org/apache/oozie/util/XmlUtils.java
@@ -30,6 +30,7 @@
import java.util.Iterator;
import java.util.List;
import java.util.Map;
+import java.util.Objects;
import java.util.Properties;
import javax.xml.parsers.DocumentBuilder;
@@ -121,7 +122,7 @@
* @throws JDOMException thrown if an error happend while XML parsing.
*/
public static Element parseXml(String xmlStr) throws JDOMException {
- ParamChecker.notNull(xmlStr, "xmlStr");
+ Objects.requireNonNull(xmlStr, "xmlStr cannot be null");
try {
SAXBuilder saxBuilder = createSAXBuilder();
Document document = saxBuilder.build(new StringReader(xmlStr));
@@ -141,7 +142,7 @@
* @throws IOException thrown if an IO error occurred.
*/
public static Element parseXml(InputStream is) throws JDOMException, IOException {
- ParamChecker.notNull(is, "is");
+ Objects.requireNonNull(is, "is cannot be null");
SAXBuilder saxBuilder = createSAXBuilder();
Document document = saxBuilder.build(is);
return document.getRootElement();
@@ -156,8 +157,8 @@
* @return value of the specified attribute.
*/
public static String getRootAttribute(String filePath, String attributeName) {
- ParamChecker.notNull(filePath, "filePath");
- ParamChecker.notNull(attributeName, "attributeName");
+ Objects.requireNonNull(filePath, "filePath cannot be null");
+ Objects.requireNonNull(attributeName, "attributeName cannot be null");
SAXBuilder saxBuilder = createSAXBuilder();
try {
Document doc = saxBuilder.build(Thread.currentThread().getContextClassLoader().getResourceAsStream(filePath));
@@ -181,7 +182,7 @@
}
private PrettyPrint(Element element) {
- this.element = ParamChecker.notNull(element, "element");
+ this.element = Objects.requireNonNull(element, "element cannot be null");
}
/**
diff --git a/core/src/main/java/org/apache/oozie/util/db/OperationRetryHandler.java b/core/src/main/java/org/apache/oozie/util/db/OperationRetryHandler.java
index 53f2c3a..e5949bd 100644
--- a/core/src/main/java/org/apache/oozie/util/db/OperationRetryHandler.java
+++ b/core/src/main/java/org/apache/oozie/util/db/OperationRetryHandler.java
@@ -18,6 +18,7 @@
package org.apache.oozie.util.db;
+import java.util.Objects;
import java.util.concurrent.Callable;
import java.util.function.Predicate;
@@ -46,7 +47,7 @@
this.maxRetryCount = maxRetryCount;
this.initialWaitTime = initialWaitTime;
this.maxWaitTime = maxWaitTime;
- this.retryPredicate = Preconditions.checkNotNull(retryPredicate, "Retry predicate must not be null");
+ this.retryPredicate = Objects.requireNonNull(retryPredicate, "Retry predicate must not be null");
this.shouldRetry = !(maxRetryCount == 0 || maxWaitTime == 0);
LOG.trace("Retry handler parameters are set." +
diff --git a/core/src/main/java/org/apache/oozie/workflow/lite/ActionNodeDef.java b/core/src/main/java/org/apache/oozie/workflow/lite/ActionNodeDef.java
index 1e4852d..acde506 100644
--- a/core/src/main/java/org/apache/oozie/workflow/lite/ActionNodeDef.java
+++ b/core/src/main/java/org/apache/oozie/workflow/lite/ActionNodeDef.java
@@ -18,10 +18,10 @@
package org.apache.oozie.workflow.lite;
-import org.apache.oozie.util.ParamChecker;
import org.apache.oozie.util.XLog;
import java.util.Arrays;
+import java.util.Objects;
/**
* Node definition for workflow action. This node definition is serialized object and should provide
@@ -35,17 +35,17 @@
public ActionNodeDef(String name, String conf, Class<? extends ActionNodeHandler> actionHandlerClass, String onOk,
String onError) {
- super(name, ParamChecker.notNull(conf, "conf"), actionHandlerClass, Arrays.asList(onOk, onError));
+ super(name, Objects.requireNonNull(conf, "conf cannot be null"), actionHandlerClass, Arrays.asList(onOk, onError));
}
public ActionNodeDef(String name, String conf, Class<? extends ActionNodeHandler> actionHandlerClass, String onOk,
String onError, String cred) {
- super(name, ParamChecker.notNull(conf, "conf"), actionHandlerClass, Arrays.asList(onOk, onError), cred);
+ super(name, Objects.requireNonNull(conf, "conf cannot be null"), actionHandlerClass, Arrays.asList(onOk, onError), cred);
}
public ActionNodeDef(String name, String conf, Class<? extends ActionNodeHandler> actionHandlerClass, String onOk,
String onError, String cred, String userRetryMax, String userRetryInterval, String userRetryPolicy) {
- super(name, ParamChecker.notNull(conf, "conf"), actionHandlerClass, Arrays.asList(onOk, onError), cred,
+ super(name, Objects.requireNonNull(conf, "conf cannot be null"), actionHandlerClass, Arrays.asList(onOk, onError), cred,
userRetryMax, userRetryInterval, userRetryPolicy);
}
}
diff --git a/core/src/main/java/org/apache/oozie/workflow/lite/DBLiteWorkflowLib.java b/core/src/main/java/org/apache/oozie/workflow/lite/DBLiteWorkflowLib.java
index fbc1aef..51fb068 100644
--- a/core/src/main/java/org/apache/oozie/workflow/lite/DBLiteWorkflowLib.java
+++ b/core/src/main/java/org/apache/oozie/workflow/lite/DBLiteWorkflowLib.java
@@ -20,13 +20,13 @@
import java.sql.Connection;
import java.sql.SQLException;
+import java.util.Objects;
import javax.xml.validation.Schema;
import org.apache.oozie.store.OozieSchema.OozieColumn;
import org.apache.oozie.store.OozieSchema.OozieTable;
import org.apache.oozie.workflow.WorkflowException;
import org.apache.oozie.workflow.WorkflowInstance;
-import org.apache.oozie.util.ParamChecker;
import org.apache.oozie.util.WritableUtils;
import org.apache.oozie.util.db.SqlStatement.ResultSetReader;
import org.apache.oozie.util.db.SqlStatement;
@@ -52,7 +52,7 @@
*/
@Override
public void insert(WorkflowInstance instance) throws WorkflowException {
- ParamChecker.notNull(instance, "instance");
+ Objects.requireNonNull(instance, "instance cannot be null");
try {
SqlStatement.insertInto(OozieTable.WF_PROCESS_INSTANCE).value(OozieColumn.PI_wfId, instance.getId()).value(
OozieColumn.PI_state, WritableUtils.toByteArray((LiteWorkflowInstance) instance))
@@ -72,10 +72,10 @@
*/
@Override
public WorkflowInstance get(String id) throws WorkflowException {
- ParamChecker.notNull(id, "id");
+ Objects.requireNonNull(id, "id cannot be null");
try {
ResultSetReader rs = SqlStatement.parse(SqlStatement.selectColumns(OozieColumn.PI_state).where(
- SqlStatement.isEqual(OozieColumn.PI_wfId, ParamChecker.notNull(id, "id"))).
+ SqlStatement.isEqual(OozieColumn.PI_wfId, Objects.requireNonNull(id, "id cannot be null"))).
prepareAndSetValues(connection).executeQuery());
rs.next();
LiteWorkflowInstance pInstance = WritableUtils.fromByteArray(rs.getByteArray(OozieColumn.PI_state),
@@ -95,7 +95,7 @@
*/
@Override
public void update(WorkflowInstance instance) throws WorkflowException {
- ParamChecker.notNull(instance, "instance");
+ Objects.requireNonNull(instance, "instance cannot be null");
try {
SqlStatement.update(OozieTable.WF_PROCESS_INSTANCE).set(OozieColumn.PI_state,
WritableUtils
@@ -116,7 +116,7 @@
*/
@Override
public void delete(String id) throws WorkflowException {
- ParamChecker.notNull(id, "id");
+ Objects.requireNonNull(id, "id cannot be null");
try {
SqlStatement.deleteFrom(OozieTable.WF_PROCESS_INSTANCE).where(
SqlStatement.isEqual(OozieColumn.PI_wfId, id)).prepareAndSetValues(connection).executeUpdate();
diff --git a/core/src/main/java/org/apache/oozie/workflow/lite/DecisionNodeDef.java b/core/src/main/java/org/apache/oozie/workflow/lite/DecisionNodeDef.java
index 13a3d8a..4ca5e41 100644
--- a/core/src/main/java/org/apache/oozie/workflow/lite/DecisionNodeDef.java
+++ b/core/src/main/java/org/apache/oozie/workflow/lite/DecisionNodeDef.java
@@ -18,9 +18,8 @@
package org.apache.oozie.workflow.lite;
-import org.apache.oozie.util.ParamChecker;
-
import java.util.List;
+import java.util.Objects;
public class DecisionNodeDef extends NodeDef {
@@ -28,7 +27,7 @@
}
public DecisionNodeDef(String name, String conf, Class<? extends DecisionNodeHandler> clazz, List<String> evals) {
- super(name, ParamChecker.notNull(conf, "conf"), clazz, evals);
+ super(name, Objects.requireNonNull(conf, "conf cannot be null"), clazz, evals);
}
diff --git a/core/src/main/java/org/apache/oozie/workflow/lite/LiteWorkflowApp.java b/core/src/main/java/org/apache/oozie/workflow/lite/LiteWorkflowApp.java
index 5e6dc7a..b777da3 100644
--- a/core/src/main/java/org/apache/oozie/workflow/lite/LiteWorkflowApp.java
+++ b/core/src/main/java/org/apache/oozie/workflow/lite/LiteWorkflowApp.java
@@ -33,6 +33,7 @@
import java.util.Collections;
import java.util.LinkedHashMap;
import java.util.Map;
+import java.util.Objects;
//TODO javadoc
public class LiteWorkflowApp implements Writable, WorkflowApp {
@@ -63,7 +64,7 @@
}
public LiteWorkflowApp addNode(NodeDef node) throws WorkflowException {
- ParamChecker.notNull(node, "node");
+ Objects.requireNonNull(node, "node cannot be null");
if (complete) {
throw new WorkflowException(ErrorCode.E0704, name);
}
diff --git a/core/src/main/java/org/apache/oozie/workflow/lite/LiteWorkflowInstance.java b/core/src/main/java/org/apache/oozie/workflow/lite/LiteWorkflowInstance.java
index 560353c..0a36574 100644
--- a/core/src/main/java/org/apache/oozie/workflow/lite/LiteWorkflowInstance.java
+++ b/core/src/main/java/org/apache/oozie/workflow/lite/LiteWorkflowInstance.java
@@ -42,6 +42,7 @@
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import java.util.Objects;
//TODO javadoc
public class LiteWorkflowInstance implements Writable, WorkflowInstance {
@@ -159,9 +160,9 @@
public LiteWorkflowInstance(LiteWorkflowApp def, Configuration conf, String instanceId) {
this();
- this.def = ParamChecker.notNull(def, "def");
- this.instanceId = ParamChecker.notNull(instanceId, "instanceId");
- this.conf = ParamChecker.notNull(conf, "conf");
+ this.def = Objects.requireNonNull(def, "def cannot be null");
+ this.instanceId = Objects.requireNonNull(instanceId, "instanceId cannot be null");
+ this.conf = Objects.requireNonNull(conf, "conf cannot be null");
refreshLog();
status = Status.PREP;
}
@@ -180,7 +181,7 @@
public synchronized boolean signal(String executionPath, String signalValue) throws WorkflowException {
ParamChecker.notEmpty(executionPath, "executionPath");
- ParamChecker.notNull(signalValue, "signalValue");
+ Objects.requireNonNull(signalValue, "signalValue cannot be null");
if (status != Status.RUNNING) {
throw new WorkflowException(ErrorCode.E0716);
diff --git a/core/src/main/java/org/apache/oozie/workflow/lite/LiteWorkflowLib.java b/core/src/main/java/org/apache/oozie/workflow/lite/LiteWorkflowLib.java
index 2e09889..1624d1b 100644
--- a/core/src/main/java/org/apache/oozie/workflow/lite/LiteWorkflowLib.java
+++ b/core/src/main/java/org/apache/oozie/workflow/lite/LiteWorkflowLib.java
@@ -31,6 +31,7 @@
import javax.xml.validation.Schema;
import java.io.StringReader;
+import java.util.Objects;
//TODO javadoc
public abstract class LiteWorkflowLib implements WorkflowLib {
@@ -58,7 +59,7 @@
@Override
public WorkflowInstance createInstance(WorkflowApp app, Configuration conf) throws WorkflowException {
- ParamChecker.notNull(app, "app");
+ Objects.requireNonNull(app, "app cannot be null");
String jobId = Services.get().get(UUIDService.class).generateId(ApplicationType.WORKFLOW);
return new LiteWorkflowInstance((LiteWorkflowApp) app, conf, jobId);
}
@@ -66,8 +67,8 @@
@Override
public WorkflowInstance createInstance(WorkflowApp app, Configuration conf, String wfId)
throws WorkflowException {
- ParamChecker.notNull(app, "app");
- ParamChecker.notNull(wfId, "wfId");
+ Objects.requireNonNull(app, "app cannot be null");
+ Objects.requireNonNull(wfId, "wfId cannot be null");
return new LiteWorkflowInstance((LiteWorkflowApp) app, conf, wfId);
}
}
diff --git a/core/src/main/java/org/apache/oozie/workflow/lite/NodeDef.java b/core/src/main/java/org/apache/oozie/workflow/lite/NodeDef.java
index b24b844..9f5b671 100644
--- a/core/src/main/java/org/apache/oozie/workflow/lite/NodeDef.java
+++ b/core/src/main/java/org/apache/oozie/workflow/lite/NodeDef.java
@@ -30,6 +30,7 @@
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
+import java.util.Objects;
/**
* This node definition is serialized object and should provide readFields() and write() for read and write of fields in
@@ -52,7 +53,7 @@
NodeDef(String name, String conf, Class<? extends NodeHandler> handlerClass, List<String> transitions) {
this.name = ParamChecker.notEmpty(name, "name");
this.conf = conf;
- this.handlerClass = ParamChecker.notNull(handlerClass, "handlerClass");
+ this.handlerClass = Objects.requireNonNull(handlerClass, "handlerClass cannot be null");
this.transitions = Collections.unmodifiableList(ParamChecker.notEmptyElements(transitions, "transitions"));
}
diff --git a/core/src/test/java/org/apache/oozie/test/XTestCase.java b/core/src/test/java/org/apache/oozie/test/XTestCase.java
index ed02ff6..f62e3df 100644
--- a/core/src/test/java/org/apache/oozie/test/XTestCase.java
+++ b/core/src/test/java/org/apache/oozie/test/XTestCase.java
@@ -37,6 +37,7 @@
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
+import java.util.Objects;
import java.util.Properties;
import java.util.UUID;
import java.util.concurrent.atomic.AtomicInteger;
@@ -644,7 +645,7 @@
* @return the test working directory.
*/
private String getTestCaseDirInternal(TestCase testCase) {
- ParamChecker.notNull(testCase, "testCase");
+ Objects.requireNonNull(testCase, "testCase cannot be null");
File dir = new File(System.getProperty(OOZIE_TEST_DIR, "target/test-data"));
dir = new File(dir, "oozietests").getAbsoluteFile();
dir = new File(dir, testCase.getClass().getName());
@@ -654,7 +655,7 @@
}
protected void delete(File file) throws IOException {
- ParamChecker.notNull(file, "file");
+ Objects.requireNonNull(file, "file cannot be null");
if (file.getAbsolutePath().length() < 5) {
throw new RuntimeException(XLog.format("path [{0}] is too short, not deleting", file.getAbsolutePath()));
}
@@ -707,14 +708,14 @@
* @return the absolute path to the created directory.
*/
protected String createTestCaseSubDir(String... subDirNames) {
- ParamChecker.notNull(subDirNames, "subDirName");
+ Objects.requireNonNull(subDirNames, "subDirName cannot be null");
if (subDirNames.length == 0) {
throw new RuntimeException(XLog.format("Could not create testcase subdir ''; it already exists"));
}
File dir = new File(testCaseDir);
for (int i = 0; i < subDirNames.length; i++) {
- ParamChecker.notNull(subDirNames[i], "subDirName[" + i + "]");
+ Objects.requireNonNull(subDirNames[i], "subDirName[" + i + "] cannot be null");
dir = new File(dir, subDirNames[i]);
}
@@ -787,7 +788,7 @@
* @return the waited time.
*/
protected long waitFor(int timeout, Predicate predicate) {
- ParamChecker.notNull(predicate, "predicate");
+ Objects.requireNonNull(predicate, "predicate cannot be null");
XLog log = new XLog(LogFactory.getLog(getClass()));
long started = System.currentTimeMillis();
long mustEnd = System.currentTimeMillis() + (long)(WAITFOR_RATIO * timeout);
diff --git a/core/src/test/java/org/apache/oozie/util/TestParamChecker.java b/core/src/test/java/org/apache/oozie/util/TestParamChecker.java
index 76f2a9c..9d709b5 100644
--- a/core/src/test/java/org/apache/oozie/util/TestParamChecker.java
+++ b/core/src/test/java/org/apache/oozie/util/TestParamChecker.java
@@ -25,17 +25,6 @@
public class TestParamChecker extends XTestCase {
- public void testNotNull() {
- ParamChecker.notNull("value", "name");
- try {
- ParamChecker.notNull(null, "name");
- fail();
- }
- catch (IllegalArgumentException ex) {
- // nop
- }
- }
-
public void testNotNullElements() {
ParamChecker.notEmptyElements(new ArrayList<String>(), "name");
ParamChecker.notEmptyElements(Arrays.asList("a"), "name");
@@ -43,7 +32,7 @@
ParamChecker.notEmptyElements(null, "name");
fail();
}
- catch (IllegalArgumentException ex) {
+ catch (IllegalArgumentException | NullPointerException ex) {
// nop
}
try {
@@ -80,7 +69,7 @@
ParamChecker.notEmptyElements(null, "name");
fail();
}
- catch (IllegalArgumentException ex) {
+ catch (IllegalArgumentException | NullPointerException ex) {
// nop
}
try {
diff --git a/core/src/test/java/org/apache/oozie/util/TestParameterVerifier.java b/core/src/test/java/org/apache/oozie/util/TestParameterVerifier.java
index 15bd99a..9cc08ed 100644
--- a/core/src/test/java/org/apache/oozie/util/TestParameterVerifier.java
+++ b/core/src/test/java/org/apache/oozie/util/TestParameterVerifier.java
@@ -28,7 +28,7 @@
try {
ParameterVerifier.verifyParameters(null, XmlUtils.parseXml("<root xmlns=\"uri:oozie:workflow:0.4\"></root>"));
fail();
- } catch (IllegalArgumentException ex) {
+ } catch (IllegalArgumentException | NullPointerException ex) {
assertEquals("conf cannot be null", ex.getMessage());
}
@@ -40,7 +40,7 @@
try {
ParameterVerifier.verifyParameters(null, null);
- } catch (IllegalArgumentException ex) {
+ } catch (IllegalArgumentException | NullPointerException ex) {
assertEquals("conf cannot be null", ex.getMessage());
}
}
diff --git a/core/src/test/java/org/apache/oozie/util/TestPriorityDelayQueue.java b/core/src/test/java/org/apache/oozie/util/TestPriorityDelayQueue.java
index b48e0cc..8c5a491 100644
--- a/core/src/test/java/org/apache/oozie/util/TestPriorityDelayQueue.java
+++ b/core/src/test/java/org/apache/oozie/util/TestPriorityDelayQueue.java
@@ -23,6 +23,7 @@
import java.text.MessageFormat;
import java.util.ArrayList;
import java.util.List;
+import java.util.Objects;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicInteger;
@@ -50,28 +51,28 @@
new TestQueueElement<Object>(null);
fail();
}
- catch (IllegalArgumentException ex) {
+ catch (IllegalArgumentException | NullPointerException ex) {
}
try {
new TestQueueElement<Object>(null, 0, 0, TimeUnit.MILLISECONDS);
fail();
}
- catch (IllegalArgumentException ex) {
+ catch (IllegalArgumentException | NullPointerException ex) {
}
try {
new TestQueueElement<Object>(obj, -1, 0, TimeUnit.MILLISECONDS);
fail();
}
- catch (IllegalArgumentException ex) {
+ catch (IllegalArgumentException | NullPointerException ex) {
}
try {
new TestQueueElement<Object>(obj, 0, -1, TimeUnit.MILLISECONDS);
fail();
}
- catch (IllegalArgumentException ex) {
+ catch (IllegalArgumentException | NullPointerException ex) {
}
TestQueueElement<Object> e1 = new TestQueueElement<Object>(obj);
@@ -422,7 +423,7 @@
return false;
}
}, priority, delay, unit);
- ParamChecker.notNull(element, "element can't be null");
+ Objects.requireNonNull(element, "element cannot be null");
}
public TestQueueElement(E element) {
diff --git a/examples/src/test/java/org/apache/oozie/example/TestLocalOozieExample.java b/examples/src/test/java/org/apache/oozie/example/TestLocalOozieExample.java
index 9b7bfe4..eadcf5e 100644
--- a/examples/src/test/java/org/apache/oozie/example/TestLocalOozieExample.java
+++ b/examples/src/test/java/org/apache/oozie/example/TestLocalOozieExample.java
@@ -22,12 +22,12 @@
import org.apache.oozie.service.Services;
import org.apache.oozie.test.XFsTestCase;
import org.apache.oozie.util.IOUtils;
-import org.apache.oozie.util.ParamChecker;
import org.apache.oozie.util.XLog;
import java.io.File;
import java.io.FileOutputStream;
import java.io.IOException;
+import java.util.Objects;
public class TestLocalOozieExample extends XFsTestCase {
private String oozieLocalLog;
@@ -41,7 +41,7 @@
@Override
protected void delete(File file) throws IOException {
- ParamChecker.notNull(file, "file");
+ Objects.requireNonNull(file, "file cannot be null");
if (file.getAbsolutePath().length() < 5) {
throw new RuntimeException(XLog.format("path [{0}] is too short, not deleting", file.getAbsolutePath()));
}
diff --git a/fluent-job/fluent-job-api/src/main/java/org/apache/oozie/fluentjob/api/mapping/DecisionConverter.java b/fluent-job/fluent-job-api/src/main/java/org/apache/oozie/fluentjob/api/mapping/DecisionConverter.java
index 7523436..9173cac 100644
--- a/fluent-job/fluent-job-api/src/main/java/org/apache/oozie/fluentjob/api/mapping/DecisionConverter.java
+++ b/fluent-job/fluent-job-api/src/main/java/org/apache/oozie/fluentjob/api/mapping/DecisionConverter.java
@@ -33,6 +33,7 @@
import com.github.dozermapper.core.MapperAware;
import java.util.List;
+import java.util.Objects;
/**
* A {@link DozerConverter} converting from {@link Decision} to JAXB {@link DECISION}.
@@ -62,7 +63,7 @@
}
private Mapper checkAndGetMapper() {
- Preconditions.checkNotNull(mapper, "mapper should be set");
+ Objects.requireNonNull(mapper, "mapper should be set");
return mapper;
}
diff --git a/fluent-job/fluent-job-api/src/main/java/org/apache/oozie/fluentjob/api/mapping/ExplicitNodeConverter.java b/fluent-job/fluent-job-api/src/main/java/org/apache/oozie/fluentjob/api/mapping/ExplicitNodeConverter.java
index a890def..7c165a0 100644
--- a/fluent-job/fluent-job-api/src/main/java/org/apache/oozie/fluentjob/api/mapping/ExplicitNodeConverter.java
+++ b/fluent-job/fluent-job-api/src/main/java/org/apache/oozie/fluentjob/api/mapping/ExplicitNodeConverter.java
@@ -50,10 +50,10 @@
import com.github.dozermapper.core.DozerConverter;
import com.github.dozermapper.core.Mapper;
import com.github.dozermapper.core.MapperAware;
-import com.google.common.base.Preconditions;
import javax.xml.bind.JAXBElement;
import java.util.Map;
+import java.util.Objects;
/**
* A {@link DozerConverter} converting from {@link ExplicitNode} to JAXB {@link ACTION}.
@@ -120,7 +120,7 @@
}
private Mapper checkAndGetMapper() {
- Preconditions.checkNotNull(mapper, "mapper should be set");
+ Objects.requireNonNull(mapper, "mapper should be set");
return mapper;
}
@@ -184,7 +184,7 @@
actionTypeObject = checkAndGetMapper().map(realNode, mappedClass);
}
- Preconditions.checkNotNull(actionTypeObject, "actionTypeObject");
+ Objects.requireNonNull(actionTypeObject, "actionTypeObject cannot be null");
if (actionTypeObject instanceof MAPREDUCE) {
destination.setMapReduce((MAPREDUCE) actionTypeObject);
diff --git a/fluent-job/fluent-job-api/src/main/java/org/apache/oozie/fluentjob/api/mapping/GlobalConverter.java b/fluent-job/fluent-job-api/src/main/java/org/apache/oozie/fluentjob/api/mapping/GlobalConverter.java
index dae2655..372b690 100644
--- a/fluent-job/fluent-job-api/src/main/java/org/apache/oozie/fluentjob/api/mapping/GlobalConverter.java
+++ b/fluent-job/fluent-job-api/src/main/java/org/apache/oozie/fluentjob/api/mapping/GlobalConverter.java
@@ -18,7 +18,6 @@
package org.apache.oozie.fluentjob.api.mapping;
-import com.google.common.base.Preconditions;
import org.apache.oozie.fluentjob.api.generated.workflow.CONFIGURATION;
import org.apache.oozie.fluentjob.api.generated.workflow.GLOBAL;
import org.apache.oozie.fluentjob.api.generated.workflow.LAUNCHER;
@@ -28,6 +27,8 @@
import com.github.dozermapper.core.Mapper;
import com.github.dozermapper.core.MapperAware;
+import java.util.Objects;
+
/**
* A {@link DozerConverter} converting from {@link Global} to JAXB {@link GLOBAL}.
*/
@@ -89,7 +90,7 @@
}
private Mapper checkAndGetMapper() {
- Preconditions.checkNotNull(mapper, "mapper should be set");
+ Objects.requireNonNull(mapper, "mapper should be set");
return mapper;
}
diff --git a/fluent-job/fluent-job-api/src/main/java/org/apache/oozie/fluentjob/api/mapping/GraphNodesToWORKFLOWAPPConverter.java b/fluent-job/fluent-job-api/src/main/java/org/apache/oozie/fluentjob/api/mapping/GraphNodesToWORKFLOWAPPConverter.java
index 00f4c4f..cce2f20 100644
--- a/fluent-job/fluent-job-api/src/main/java/org/apache/oozie/fluentjob/api/mapping/GraphNodesToWORKFLOWAPPConverter.java
+++ b/fluent-job/fluent-job-api/src/main/java/org/apache/oozie/fluentjob/api/mapping/GraphNodesToWORKFLOWAPPConverter.java
@@ -18,7 +18,6 @@
package org.apache.oozie.fluentjob.api.mapping;
-import com.google.common.base.Preconditions;
import org.apache.oozie.fluentjob.api.generated.workflow.ACTION;
import org.apache.oozie.fluentjob.api.generated.workflow.ACTIONTRANSITION;
import org.apache.oozie.fluentjob.api.generated.workflow.CREDENTIALS;
@@ -48,6 +47,7 @@
import java.util.HashMap;
import java.util.Map;
+import java.util.Objects;
/**
* A {@link DozerConverter} converting from {@link GraphNodes} to JAXB {@link WORKFLOWAPP}.
@@ -175,7 +175,7 @@
}
private void convertNode(final NodeBase nodeBase, final WORKFLOWAPP workflowapp, final KILL kill) {
- Preconditions.checkNotNull(nodeBase, "nodeBase");
+ Objects.requireNonNull(nodeBase, "nodeBase cannot be null");
final Class<?> sourceClass = nodeBase.getClass();
if (SOURCE_TARGET_CLASSES.containsKey(sourceClass)) {
diff --git a/fluent-job/fluent-job-api/src/main/java/org/apache/oozie/fluentjob/api/mapping/GraphToWORKFLOWAPPConverter.java b/fluent-job/fluent-job-api/src/main/java/org/apache/oozie/fluentjob/api/mapping/GraphToWORKFLOWAPPConverter.java
index b7d99df..e4635af 100644
--- a/fluent-job/fluent-job-api/src/main/java/org/apache/oozie/fluentjob/api/mapping/GraphToWORKFLOWAPPConverter.java
+++ b/fluent-job/fluent-job-api/src/main/java/org/apache/oozie/fluentjob/api/mapping/GraphToWORKFLOWAPPConverter.java
@@ -18,13 +18,14 @@
package org.apache.oozie.fluentjob.api.mapping;
-import com.google.common.base.Preconditions;
import org.apache.oozie.fluentjob.api.generated.workflow.WORKFLOWAPP;
import org.apache.oozie.fluentjob.api.dag.Graph;
import com.github.dozermapper.core.DozerConverter;
import com.github.dozermapper.core.Mapper;
import com.github.dozermapper.core.MapperAware;
+import java.util.Objects;
+
/**
* A {@link DozerConverter} converting from {@link Graph} to JAXB {@link WORKFLOWAPP}.
* <p>
@@ -56,7 +57,7 @@
}
private Mapper checkAndGetMapper() {
- Preconditions.checkNotNull(mapper, "mapper should be set");
+ Objects.requireNonNull(mapper, "mapper should be set");
return mapper;
}
diff --git a/release-log.txt b/release-log.txt
index cf36bed..fe5ad3f 100644
--- a/release-log.txt
+++ b/release-log.txt
@@ -1,5 +1,6 @@
-- Oozie 5.2.0 release (trunk - unreleased)
+OOZIE-3513 Migrate from Preconditions.checkNotNull and ParamChecker.notNull (asalamon74 via kmarton)
OOZIE-2907 Delete PrepareActionsDriver from oozie-sharelib (asalamon74 via kmarton)
OOZIE-3518 [docs] Dead links in DG_HCatalogIntegration (nobigo via asalamon74)
OOZIE-3517 Invalid reference to xtheme-default.css (nobigo via asalamon74)
diff --git a/server/src/main/java/org/apache/oozie/server/EmbeddedOozieServer.java b/server/src/main/java/org/apache/oozie/server/EmbeddedOozieServer.java
index e2bb730..daf5237 100644
--- a/server/src/main/java/org/apache/oozie/server/EmbeddedOozieServer.java
+++ b/server/src/main/java/org/apache/oozie/server/EmbeddedOozieServer.java
@@ -18,7 +18,6 @@
package org.apache.oozie.server;
-import com.google.common.base.Preconditions;
import com.google.inject.Guice;
import com.google.inject.Inject;
import com.google.inject.Injector;
@@ -45,6 +44,7 @@
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.net.URISyntaxException;
+import java.util.Objects;
/**
* Class to start Oozie inside an embedded Jetty server.
@@ -91,15 +91,15 @@
final ConstraintSecurityHandler constraintSecurityHandler)
{
this.constraintSecurityHandler = constraintSecurityHandler;
- this.serviceController = Preconditions.checkNotNull(serviceController, "serviceController is null");
- this.jspHandler = Preconditions.checkNotNull(jspHandler, "jspHandler is null");
- this.sslServerConnectorFactory = Preconditions.checkNotNull(sslServerConnectorFactory,
+ this.serviceController = Objects.requireNonNull(serviceController, "serviceController is null");
+ this.jspHandler = Objects.requireNonNull(jspHandler, "jspHandler is null");
+ this.sslServerConnectorFactory = Objects.requireNonNull(sslServerConnectorFactory,
"sslServerConnectorFactory is null");
- this.server = Preconditions.checkNotNull(server, "server is null");
- this.oozieRewriteHandler = Preconditions.checkNotNull(oozieRewriteHandler, "rewriter is null");
- this.servletContextHandler = Preconditions.checkNotNull(servletContextHandler, "servletContextHandler is null");
- this.oozieServletMapper = Preconditions.checkNotNull(oozieServletMapper, "oozieServletMapper is null");
- this.oozieFilterMapper = Preconditions.checkNotNull(oozieFilterMapper, "oozieFilterMapper is null");
+ this.server = Objects.requireNonNull(server, "server is null");
+ this.oozieRewriteHandler = Objects.requireNonNull(oozieRewriteHandler, "rewriter is null");
+ this.servletContextHandler = Objects.requireNonNull(servletContextHandler, "servletContextHandler is null");
+ this.oozieServletMapper = Objects.requireNonNull(oozieServletMapper, "oozieServletMapper is null");
+ this.oozieFilterMapper = Objects.requireNonNull(oozieFilterMapper, "oozieFilterMapper is null");
}
/**
diff --git a/server/src/main/java/org/apache/oozie/server/FilterMapper.java b/server/src/main/java/org/apache/oozie/server/FilterMapper.java
index b5d59fd..521f34d 100644
--- a/server/src/main/java/org/apache/oozie/server/FilterMapper.java
+++ b/server/src/main/java/org/apache/oozie/server/FilterMapper.java
@@ -18,7 +18,6 @@
package org.apache.oozie.server;
-import com.google.common.base.Preconditions;
import com.google.inject.Inject;
import org.apache.oozie.servlet.AuthFilter;
import org.apache.oozie.servlet.HttpResponseHeaderFilter;
@@ -28,13 +27,14 @@
import javax.servlet.DispatcherType;
import java.util.EnumSet;
+import java.util.Objects;
public class FilterMapper {
private final WebAppContext servletContextHandler;
@Inject
public FilterMapper(final WebAppContext servletContextHandler) {
- this.servletContextHandler = Preconditions.checkNotNull(servletContextHandler, "ServletContextHandler is null");
+ this.servletContextHandler = Objects.requireNonNull(servletContextHandler, "ServletContextHandler is null");
}
/**
diff --git a/server/src/main/java/org/apache/oozie/server/HttpConfigurationWrapper.java b/server/src/main/java/org/apache/oozie/server/HttpConfigurationWrapper.java
index 0341f9c..718b1ae 100644
--- a/server/src/main/java/org/apache/oozie/server/HttpConfigurationWrapper.java
+++ b/server/src/main/java/org/apache/oozie/server/HttpConfigurationWrapper.java
@@ -17,10 +17,11 @@
*/
package org.apache.oozie.server;
-import com.google.common.base.Preconditions;
import org.apache.hadoop.conf.Configuration;
import org.eclipse.jetty.server.HttpConfiguration;
+import java.util.Objects;
+
/**
* Class that wraps HTTP configuration settings.
*/
@@ -30,7 +31,7 @@
private Configuration conf;
public HttpConfigurationWrapper(Configuration conf) {
- this.conf = Preconditions.checkNotNull(conf, "conf");
+ this.conf = Objects.requireNonNull(conf, "conf cannot be null");
}
/**
diff --git a/server/src/main/java/org/apache/oozie/server/JspHandler.java b/server/src/main/java/org/apache/oozie/server/JspHandler.java
index 6a6fbfa..3b948c4 100644
--- a/server/src/main/java/org/apache/oozie/server/JspHandler.java
+++ b/server/src/main/java/org/apache/oozie/server/JspHandler.java
@@ -18,7 +18,6 @@
package org.apache.oozie.server;
-import com.google.common.base.Preconditions;
import org.eclipse.jetty.annotations.ServletContainerInitializersStarter;
import org.eclipse.jetty.apache.jsp.JettyJasperInitializer;
import org.eclipse.jetty.jsp.JettyJspServlet;
@@ -37,6 +36,7 @@
import java.net.URLClassLoader;
import java.util.ArrayList;
import java.util.List;
+import java.util.Objects;
/**
* Helper class that is used to handle JSP requests in Oozie server.
@@ -79,7 +79,7 @@
public void setupWebAppContext(WebAppContext servletContextHandler)
throws IOException, URISyntaxException
{
- Preconditions.checkNotNull(servletContextHandler, "servletContextHandler is null");
+ Objects.requireNonNull(servletContextHandler, "servletContextHandler is null");
File scratchDir = getScratchDir();
servletContextHandler.setAttribute("javax.servlet.context.tempdir", scratchDir);
diff --git a/server/src/main/java/org/apache/oozie/server/SSLServerConnectorFactory.java b/server/src/main/java/org/apache/oozie/server/SSLServerConnectorFactory.java
index aea02a0..62f84b1 100644
--- a/server/src/main/java/org/apache/oozie/server/SSLServerConnectorFactory.java
+++ b/server/src/main/java/org/apache/oozie/server/SSLServerConnectorFactory.java
@@ -36,6 +36,7 @@
import org.slf4j.LoggerFactory;
import java.util.Arrays;
+import java.util.Objects;
/**
* Factory that is used to configure SSL settings for the Oozie server.
@@ -57,7 +58,7 @@
@Inject
public SSLServerConnectorFactory(final SslContextFactory sslContextFactory) {
- this.sslContextFactory = Preconditions.checkNotNull(sslContextFactory, "sslContextFactory is null");
+ this.sslContextFactory = Objects.requireNonNull(sslContextFactory, "sslContextFactory is null");
}
/**
@@ -70,8 +71,8 @@
* @return ServerConnector
*/
public ServerConnector createSecureServerConnector(int oozieHttpsPort, Configuration conf, Server server) {
- this.conf = Preconditions.checkNotNull(conf, "conf is null");
- Preconditions.checkNotNull(server, "server is null");
+ this.conf = Objects.requireNonNull(conf, "conf is null");
+ Objects.requireNonNull(server, "server is null");
Preconditions.checkState(oozieHttpsPort >= 1 && oozieHttpsPort <= 65535,
String.format("Invalid port number specified: \'%d\'. It should be between 1 and 65535.", oozieHttpsPort));
@@ -135,13 +136,13 @@
private void setKeystorePass() {
String keystorePass = ConfigurationService.getPassword(conf, OOZIE_HTTPS_KEYSTORE_PASS);
- Preconditions.checkNotNull(keystorePass, "keystorePass is null");
+ Objects.requireNonNull(keystorePass, "keystorePass is null");
sslContextFactory.setKeyManagerPassword(keystorePass);
}
private void setKeyStoreFile() {
String keystoreFile = conf.get(OOZIE_HTTPS_KEYSTORE_FILE);
- Preconditions.checkNotNull(keystoreFile, "keystoreFile is null");
+ Objects.requireNonNull(keystoreFile, "keystoreFile is null");
sslContextFactory.setKeyStorePath(keystoreFile);
}
diff --git a/server/src/main/java/org/apache/oozie/server/ServletMapper.java b/server/src/main/java/org/apache/oozie/server/ServletMapper.java
index e0a1358..fcc7d92 100644
--- a/server/src/main/java/org/apache/oozie/server/ServletMapper.java
+++ b/server/src/main/java/org/apache/oozie/server/ServletMapper.java
@@ -18,7 +18,6 @@
package org.apache.oozie.server;
-import com.google.common.base.Preconditions;
import com.google.inject.Inject;
import org.apache.oozie.servlet.CallbackServlet;
import org.apache.oozie.servlet.ErrorServlet;
@@ -42,6 +41,7 @@
import org.slf4j.LoggerFactory;
import javax.servlet.Servlet;
+import java.util.Objects;
public class ServletMapper {
private final WebAppContext servletContextHandler;
@@ -49,7 +49,7 @@
@Inject
public ServletMapper(final WebAppContext servletContextHandler) {
- this.servletContextHandler = Preconditions.checkNotNull(servletContextHandler, "ServletContextHandler is null");
+ this.servletContextHandler = Objects.requireNonNull(servletContextHandler, "ServletContextHandler is null");
}
/**
* Maps Oozie servlets to path specs. Make sure it is in sync with FilterMapper when making changes.
diff --git a/sharelib/git/src/main/java/org/apache/oozie/action/hadoop/GitMain.java b/sharelib/git/src/main/java/org/apache/oozie/action/hadoop/GitMain.java
index 692195c..a68e777 100644
--- a/sharelib/git/src/main/java/org/apache/oozie/action/hadoop/GitMain.java
+++ b/sharelib/git/src/main/java/org/apache/oozie/action/hadoop/GitMain.java
@@ -25,6 +25,7 @@
import java.nio.file.attribute.PosixFilePermissions;
import java.nio.file.Files;
import java.nio.file.Paths;
+import java.util.Objects;
import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
import org.apache.hadoop.conf.Configuration;
@@ -32,7 +33,6 @@
import org.apache.hadoop.fs.Path;
import org.apache.oozie.action.hadoop.GitOperations.GitOperationsException;
-import com.google.common.base.Preconditions;
import com.google.common.annotations.VisibleForTesting;
public class GitMain extends LauncherMain {
@@ -177,7 +177,8 @@
* @param name - actionConf value to return
*/
String checkAndGetTrimmed(final Configuration actionConf, String name) {
- Preconditions.checkNotNull(actionConf.getTrimmed(name), "Action Configuration does not have [%s] property", name);
+ Objects.requireNonNull(actionConf.getTrimmed(name), () -> String.format("Action Configuration does not have [%s] property",
+ name));
return actionConf.getTrimmed(name);
}
diff --git a/sharelib/oozie/src/main/java/org/apache/oozie/action/hadoop/HdfsOperations.java b/sharelib/oozie/src/main/java/org/apache/oozie/action/hadoop/HdfsOperations.java
index 751d0e0..8c35ed2 100644
--- a/sharelib/oozie/src/main/java/org/apache/oozie/action/hadoop/HdfsOperations.java
+++ b/sharelib/oozie/src/main/java/org/apache/oozie/action/hadoop/HdfsOperations.java
@@ -27,6 +27,7 @@
import java.security.PrivilegedExceptionAction;
import java.util.Map;
import java.util.Map.Entry;
+import java.util.Objects;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.FileSystem;
@@ -42,7 +43,7 @@
private final SequenceFileWriterFactory seqFileWriterFactory;
public HdfsOperations(SequenceFileWriterFactory seqFileWriterFactory) {
- this.seqFileWriterFactory = Preconditions.checkNotNull(seqFileWriterFactory, "seqFileWriterFactory should not be null");
+ this.seqFileWriterFactory = Objects.requireNonNull(seqFileWriterFactory, "seqFileWriterFactory should not be null");
}
/**
diff --git a/sharelib/oozie/src/main/java/org/apache/oozie/action/hadoop/LauncherAM.java b/sharelib/oozie/src/main/java/org/apache/oozie/action/hadoop/LauncherAM.java
index 801a0ae..41e5445 100644
--- a/sharelib/oozie/src/main/java/org/apache/oozie/action/hadoop/LauncherAM.java
+++ b/sharelib/oozie/src/main/java/org/apache/oozie/action/hadoop/LauncherAM.java
@@ -48,7 +48,6 @@
import org.apache.hadoop.yarn.exceptions.YarnException;
import com.google.common.annotations.VisibleForTesting;
-import com.google.common.base.Preconditions;
import org.apache.hadoop.yarn.security.AMRMTokenIdentifier;
import org.apache.oozie.action.hadoop.security.LauncherSecurityManager;
@@ -118,18 +117,18 @@
LauncherSecurityManager launcherSecurityManager,
String containerId,
Configuration launcherConf) {
- this.amrmClientAsyncFactory = Preconditions.checkNotNull(amrmClientAsyncFactory,
+ this.amrmClientAsyncFactory = Objects.requireNonNull(amrmClientAsyncFactory,
"amrmClientAsyncFactory should not be null");
- this.amrmCallBackHandler = Preconditions.checkNotNull(amrmCallBackHandler, "amrmCallBackHandler should not be null");
- this.hdfsOperations = Preconditions.checkNotNull(hdfsOperations, "hdfsOperations should not be null");
- this.localFsOperations = Preconditions.checkNotNull(localFsOperations, "localFsOperations should not be null");
- this.prepareHandler = Preconditions.checkNotNull(prepareHandler, "prepareHandler should not be null");
- this.callbackNotifierFactory = Preconditions.checkNotNull(callbackNotifierFactory,
+ this.amrmCallBackHandler = Objects.requireNonNull(amrmCallBackHandler, "amrmCallBackHandler should not be null");
+ this.hdfsOperations = Objects.requireNonNull(hdfsOperations, "hdfsOperations should not be null");
+ this.localFsOperations = Objects.requireNonNull(localFsOperations, "localFsOperations should not be null");
+ this.prepareHandler = Objects.requireNonNull(prepareHandler, "prepareHandler should not be null");
+ this.callbackNotifierFactory = Objects.requireNonNull(callbackNotifierFactory,
"callbackNotifierFactory should not be null");
- this.launcherSecurityManager = Preconditions.checkNotNull(launcherSecurityManager,
+ this.launcherSecurityManager = Objects.requireNonNull(launcherSecurityManager,
"launcherSecurityManager should not be null");
- this.containerId = ContainerId.fromString(Preconditions.checkNotNull(containerId, "containerId should not be null"));
- this.launcherConf = Preconditions.checkNotNull(launcherConf, "launcherConf should not be null");
+ this.containerId = ContainerId.fromString(Objects.requireNonNull(containerId, "containerId should not be null"));
+ this.launcherConf = Objects.requireNonNull(launcherConf, "launcherConf should not be null");
}
public static void main(String[] args) throws Exception {
@@ -405,7 +404,7 @@
final String[] mainArgs = getMainArguments(launcherConf);
setRecoveryId();
Class<?> klass = launcherConf.getClass(CONF_OOZIE_ACTION_MAIN_CLASS, null);
- Preconditions.checkNotNull(klass, "Launcher class should not be null");
+ Objects.requireNonNull(klass, "Launcher class should not be null");
System.out.println("Launcher class: " + klass.toString());
Method mainMethod = klass.getMethod("main", String[].class);
// Enable LauncherSecurityManager to catch System.exit calls
@@ -469,7 +468,7 @@
ApplicationId applicationId = containerId.getApplicationAttemptId().getApplicationId();
final String applicationIdStr = applicationId.toString();
- final String recoveryId = Preconditions.checkNotNull(launcherConf.get(OOZIE_ACTION_RECOVERY_ID),
+ final String recoveryId = Objects.requireNonNull(launcherConf.get(OOZIE_ACTION_RECOVERY_ID),
"RecoveryID should not be null");
final Path path = new Path(actionDir, recoveryId);
diff --git a/sharelib/oozie/src/main/java/org/apache/oozie/action/hadoop/LauncherMain.java b/sharelib/oozie/src/main/java/org/apache/oozie/action/hadoop/LauncherMain.java
index bc5f695..b281d1c 100644
--- a/sharelib/oozie/src/main/java/org/apache/oozie/action/hadoop/LauncherMain.java
+++ b/sharelib/oozie/src/main/java/org/apache/oozie/action/hadoop/LauncherMain.java
@@ -39,6 +39,7 @@
import java.util.LinkedHashSet;
import java.util.List;
import java.util.Map;
+import java.util.Objects;
import java.util.Properties;
import java.util.Set;
import java.util.regex.Matcher;
@@ -49,7 +50,6 @@
import org.apache.hadoop.util.Shell;
import com.google.common.annotations.VisibleForTesting;
-import com.google.common.base.Preconditions;
import org.apache.commons.lang3.StringUtils;
import org.apache.hadoop.yarn.api.ApplicationClientProtocol;
@@ -164,7 +164,7 @@
@VisibleForTesting
protected static void extractJobIDs(String line, Pattern[] patterns, Set<String> jobIds) {
- Preconditions.checkNotNull(line);
+ Objects.requireNonNull(line);
for (Pattern pattern : patterns) {
Matcher matcher = pattern.matcher(line);
if (matcher.find()) {
diff --git a/tools/src/main/java/org/apache/oozie/tools/OozieDBImportCLI.java b/tools/src/main/java/org/apache/oozie/tools/OozieDBImportCLI.java
index f91a453..2ba3ce8 100644
--- a/tools/src/main/java/org/apache/oozie/tools/OozieDBImportCLI.java
+++ b/tools/src/main/java/org/apache/oozie/tools/OozieDBImportCLI.java
@@ -61,11 +61,11 @@
import java.util.Arrays;
import java.util.List;
import java.util.ListIterator;
+import java.util.Objects;
import java.util.Set;
import java.util.zip.ZipEntry;
import java.util.zip.ZipFile;
-import static com.google.common.base.Preconditions.checkNotNull;
import static com.google.common.base.Preconditions.checkState;
import static org.apache.oozie.tools.OozieDBExportCLI.OOZIEDB_AC_JSON;
import static org.apache.oozie.tools.OozieDBExportCLI.OOZIEDB_BNA_JSON;
@@ -444,7 +444,7 @@
* Commit the {@link EntityTransaction}
*/
void commit() {
- checkNotNull(currentTransaction, "TX should be open.");
+ Objects.requireNonNull(currentTransaction, "TX should be open.");
currentTransaction.commit();
@@ -472,7 +472,7 @@
* @param newEntity the new {@link javax.persistence.Entity} instance
*/
void persist(final E newEntity) {
- checkNotNull(currentTransaction, "TX should be open.");
+ Objects.requireNonNull(currentTransaction, "TX should be open.");
entityManager.persist(newEntity);
pendingEntities.add(newEntity);
diff --git a/tools/src/main/java/org/apache/oozie/tools/OozieSharelibCLI.java b/tools/src/main/java/org/apache/oozie/tools/OozieSharelibCLI.java
index 6c1195c..b49f4a7 100644
--- a/tools/src/main/java/org/apache/oozie/tools/OozieSharelibCLI.java
+++ b/tools/src/main/java/org/apache/oozie/tools/OozieSharelibCLI.java
@@ -29,6 +29,7 @@
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import java.util.Objects;
import java.util.Set;
import java.util.concurrent.Callable;
import java.util.concurrent.CancellationException;
@@ -398,12 +399,12 @@
CopyTaskCallable(CopyTaskConfiguration copyTask, File file, Path trgName, long blockSize,
Set<CopyTaskConfiguration> failedCopyTasks) {
- Preconditions.checkNotNull(copyTask);
- Preconditions.checkNotNull(file);
- Preconditions.checkNotNull(trgName);
- Preconditions.checkNotNull(failedCopyTasks);
- Preconditions.checkNotNull(copyTask.dstPath);
- Preconditions.checkNotNull(copyTask.fs);
+ Objects.requireNonNull(copyTask, "copyTask cannot be null");
+ Objects.requireNonNull(file, "file cannot be null");
+ Objects.requireNonNull(trgName, "trgName cannot be null");
+ Objects.requireNonNull(failedCopyTasks, "failedCopyTask cannot be null");
+ Objects.requireNonNull(copyTask.dstPath, "copyTask.dstPath cannot be null");
+ Objects.requireNonNull(copyTask.fs, "copyTask.fs cannot be null");
this.file = file;
this.destinationPath = copyTask.dstPath;
this.failedCopyTasks = failedCopyTasks;
diff --git a/tools/src/main/java/org/apache/oozie/tools/diag/ArgParser.java b/tools/src/main/java/org/apache/oozie/tools/diag/ArgParser.java
index 115d0ba..0a190f4 100644
--- a/tools/src/main/java/org/apache/oozie/tools/diag/ArgParser.java
+++ b/tools/src/main/java/org/apache/oozie/tools/diag/ArgParser.java
@@ -31,6 +31,7 @@
import java.io.File;
import java.io.IOException;
+import java.util.Objects;
@SuppressFBWarnings(value = "PATH_TRAVERSAL_IN", justification = "Output directory is specified by user")
class ArgParser {
@@ -103,7 +104,7 @@
File ensureOutputDir() throws IOException {
final String output = commandLine.getOptionValue(OUTPUT_DIR_OPTION);
- Preconditions.checkNotNull(output);
+ Objects.requireNonNull(output, "output cannot be null");
final File outputDir = new File(output);
if (!outputDir.isDirectory() && !outputDir.mkdirs()) {
