Repository: oozie Updated Branches: refs/heads/master fb582110f -> f01e10f4d
OOZIE-3114 Fix javadoc for warning: no @return (dbist13 via gezapeti) Change-Id: I95efec1169710a8d8e0201791e5161cd6851c284 Project: http://git-wip-us.apache.org/repos/asf/oozie/repo Commit: http://git-wip-us.apache.org/repos/asf/oozie/commit/f01e10f4 Tree: http://git-wip-us.apache.org/repos/asf/oozie/tree/f01e10f4 Diff: http://git-wip-us.apache.org/repos/asf/oozie/diff/f01e10f4 Branch: refs/heads/master Commit: f01e10f4d42f1a6def51998e8d2b477dcccad163 Parents: fb58211 Author: Gezapeti Cseh <gezap...@apache.org> Authored: Wed Nov 22 09:40:50 2017 +0100 Committer: Gezapeti Cseh <gezap...@apache.org> Committed: Wed Nov 22 09:41:36 2017 +0100 ---------------------------------------------------------------------- .../java/org/apache/oozie/client/OozieClient.java | 16 +++++++++------- release-log.txt | 1 + .../action/hadoop/LauncherAMCallbackNotifier.java | 1 + .../apache/oozie/action/hadoop/LauncherMain.java | 2 ++ .../oozie/action/hadoop/LocalFsOperations.java | 2 ++ 5 files changed, 15 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/oozie/blob/f01e10f4/client/src/main/java/org/apache/oozie/client/OozieClient.java ---------------------------------------------------------------------- diff --git a/client/src/main/java/org/apache/oozie/client/OozieClient.java b/client/src/main/java/org/apache/oozie/client/OozieClient.java index d53ca3d..7fb1cf3 100644 --- a/client/src/main/java/org/apache/oozie/client/OozieClient.java +++ b/client/src/main/java/org/apache/oozie/client/OozieClient.java @@ -213,9 +213,9 @@ public class OozieClient { NORMAL, NOWEBSERVICE, SAFEMODE } - private static final Set<String> COMPLETED_WF_STATUSES = new HashSet<String>(); - private static final Set<String> COMPLETED_COORD_AND_BUNDLE_STATUSES = new HashSet<String>(); - private static final Set<String> COMPLETED_COORD_ACTION_STATUSES = new HashSet<String>(); + private static final Set<String> COMPLETED_WF_STATUSES = new HashSet<>(); + private static final Set<String> COMPLETED_COORD_AND_BUNDLE_STATUSES = new HashSet<>(); + private static final Set<String> COMPLETED_COORD_ACTION_STATUSES = new HashSet<>(); static { COMPLETED_WF_STATUSES.add(WorkflowJob.Status.FAILED.toString()); COMPLETED_WF_STATUSES.add(WorkflowJob.Status.KILLED.toString()); @@ -245,9 +245,9 @@ public class OozieClient { private String protocolUrl; private boolean validatedVersion = false; private JSONArray supportedVersions; - private final Map<String, String> headers = new HashMap<String, String>(); + private final Map<String, String> headers = new HashMap<>(); - private static final ThreadLocal<String> USER_NAME_TL = new ThreadLocal<String>(); + private static final ThreadLocal<String> USER_NAME_TL = new ThreadLocal<>(); /** * Allows to impersonate other users in the Oozie server. The current user @@ -610,7 +610,7 @@ public class OozieClient { if ((conn.getResponseCode() == HttpURLConnection.HTTP_OK)) { Reader reader = new InputStreamReader(conn.getInputStream()); JSONObject json = (JSONObject) JSONValue.parse(reader); - Map<String, String> map = new HashMap<String, String>(); + Map<String, String> map = new HashMap<>(); for (Object key : json.keySet()) { map.put((String)key, (String)json.get(key)); } @@ -639,7 +639,7 @@ public class OozieClient { } static Map<String, String> prepareParams(String... params) { - Map<String, String> map = new LinkedHashMap<String, String>(); + Map<String, String> map = new LinkedHashMap<>(); for (int i = 0; i < params.length; i = i + 2) { map.put(params[i], params[i + 1]); } @@ -968,6 +968,7 @@ public class OozieClient { * @param jobId coord job Id. * @param scope list of coord actions to be ignored * @throws OozieClientException thrown if the job could not be changed. + * @return List<CoordinatorAction> ignore a coordinator job. */ public List<CoordinatorAction> ignore(String jobId, String scope) throws OozieClientException { return new CoordIgnore(jobId, RestConstants.JOB_COORD_SCOPE_ACTION, scope).call(); @@ -1816,6 +1817,7 @@ public class OozieClient { * @param refresh true if -refresh is given in command option * @param noCleanup true if -nocleanup is given in command option * @throws OozieClientException + * @return List<CoordinatorAction> rerun a coordinator action. */ public List<CoordinatorAction> reRunCoord(String jobId, String rerunType, String scope, boolean refresh, boolean noCleanup) throws OozieClientException { http://git-wip-us.apache.org/repos/asf/oozie/blob/f01e10f4/release-log.txt ---------------------------------------------------------------------- diff --git a/release-log.txt b/release-log.txt index bb1e5e0..2a8afe6 100644 --- a/release-log.txt +++ b/release-log.txt @@ -1,5 +1,6 @@ -- Oozie 5.0.0 release (trunk - unreleased) +OOZIE-3114 Fix javadoc for warning: no @return (dbist13 via gezapeti) OOZIE-3107 org.apache.oozie.action.hadoop.TestHiveMain#testMain is flaky (dbist13 via pbacsko) OOZIE-3125 amend TestDBLoadDump.testImportInvalidDataLeavesTablesEmpty fails (asasvari) OOZIE-3106 amend upgrade surefire-plugin to 2.20.1 (dbist13 via asasvari) http://git-wip-us.apache.org/repos/asf/oozie/blob/f01e10f4/sharelib/oozie/src/main/java/org/apache/oozie/action/hadoop/LauncherAMCallbackNotifier.java ---------------------------------------------------------------------- diff --git a/sharelib/oozie/src/main/java/org/apache/oozie/action/hadoop/LauncherAMCallbackNotifier.java b/sharelib/oozie/src/main/java/org/apache/oozie/action/hadoop/LauncherAMCallbackNotifier.java index 2972658..3d86b87 100644 --- a/sharelib/oozie/src/main/java/org/apache/oozie/action/hadoop/LauncherAMCallbackNotifier.java +++ b/sharelib/oozie/src/main/java/org/apache/oozie/action/hadoop/LauncherAMCallbackNotifier.java @@ -102,6 +102,7 @@ public class LauncherAMCallbackNotifier { /** * Notify the URL just once. Use best effort. + * @return true in case URL is notified successfully. */ protected boolean notifyURLOnce() { boolean success = false; http://git-wip-us.apache.org/repos/asf/oozie/blob/f01e10f4/sharelib/oozie/src/main/java/org/apache/oozie/action/hadoop/LauncherMain.java ---------------------------------------------------------------------- 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 3317764..7bf45e3 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 @@ -300,6 +300,8 @@ public abstract class LauncherMain { /** * Get file path from the given environment + * @param env environment + * @return path given environment returns file path */ protected static String getFilePathFromEnv(String env) { String path = System.getenv(env); http://git-wip-us.apache.org/repos/asf/oozie/blob/f01e10f4/sharelib/oozie/src/main/java/org/apache/oozie/action/hadoop/LocalFsOperations.java ---------------------------------------------------------------------- diff --git a/sharelib/oozie/src/main/java/org/apache/oozie/action/hadoop/LocalFsOperations.java b/sharelib/oozie/src/main/java/org/apache/oozie/action/hadoop/LocalFsOperations.java index 011ce93..3784ea3 100644 --- a/sharelib/oozie/src/main/java/org/apache/oozie/action/hadoop/LocalFsOperations.java +++ b/sharelib/oozie/src/main/java/org/apache/oozie/action/hadoop/LocalFsOperations.java @@ -93,6 +93,8 @@ public class LocalFsOperations { /** * Checks if a given File exists or not. This method helps writing unit tests. + * @param file to check whether it exists or not + * @return true if file exists */ public boolean fileExists(File file) { return file.exists();
