[oozie] branch master updated: OOZIE-3450 Investigate and clean git sharelib (matijhs via asalamon74)

[asalamon74]

This is an automated email from the ASF dual-hosted git repository.

asalamon74 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/oozie.git


The following commit(s) were added to refs/heads/master by this push:
     new 3e2685a  OOZIE-3450 Investigate and clean git sharelib (matijhs via 
asalamon74)
3e2685a is described below

commit 3e2685a02f337a2cd5e64d12f0a2f3f0cfdfa13b
Author: Andras Salamon <asalamo...@apache.org>
AuthorDate: Mon Apr 1 13:57:48 2019 +0200

    OOZIE-3450 Investigate and clean git sharelib (matijhs via asalamon74)
---
 release-log.txt                                       |  1 +
 sharelib/git/pom.xml                                  |  3 +++
 .../java/org/apache/oozie/action/hadoop/GitMain.java  | 19 ++++++++++++++-----
 3 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/release-log.txt b/release-log.txt
index 448cf9c..9ab627e 100644
--- a/release-log.txt
+++ b/release-log.txt
@@ -1,5 +1,6 @@
 -- Oozie 5.2.0 release (trunk - unreleased)
 
+OOZIE-3450 Investigate and clean git sharelib (matijhs via asalamon74)
 OOZIE-3443 Migrate from joda time to java.time (matijhs via asalamon74)
 OOZIE-3448 Cleanup of oozie-server copy dependency (nobigo via asalamon74)
 OOZIE-3446 Migrate from commons-lang 2.x to commons-lang 3.x (nobigo via 
asalamon74)
diff --git a/sharelib/git/pom.xml b/sharelib/git/pom.xml
index f631ba5..763708e 100644
--- a/sharelib/git/pom.xml
+++ b/sharelib/git/pom.xml
@@ -53,6 +53,7 @@
                     <artifactId>hive-exec</artifactId>
                 </exclusion>
             </exclusions>
+            <scope>provided</scope>
         </dependency>
 
         <dependency>
@@ -65,10 +66,12 @@
         <dependency>
             <groupId>org.apache.oozie</groupId>
             <artifactId>oozie-client</artifactId>
+            <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.hadoop</groupId>
             <artifactId>hadoop-client</artifactId>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.eclipse.jgit</groupId>
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 8c0e62c..692195c 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
@@ -30,9 +30,9 @@ import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.fs.FileSystem;
 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 {
@@ -172,16 +172,25 @@ public class GitMain extends LauncherMain {
     }
 
     /**
+     * Calls helper function to verify name not null and throw an exception if 
so.
+     * Otherwise, returns actionConf value
+     * @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);
+        return actionConf.getTrimmed(name);
+    }
+
+    /**
      * Parse action configuration and set configuration variables
      *
      * @param actionConf Oozie action configuration
      * @throws OozieActionConfiguratorException upon any required properties 
missing
      */
     private void parseActionConfiguration(final Configuration actionConf) 
throws OozieActionConfiguratorException {
-        final GitActionExecutor.ActionConfVerifier confChecker = new 
GitActionExecutor.ActionConfVerifier(actionConf);
 
-        nameNode = confChecker.checkAndGetTrimmed(GitActionExecutor.NAME_NODE);
-        destinationUri = 
confChecker.checkAndGetTrimmed(GitActionExecutor.DESTINATION_URI);
+        nameNode = checkAndGetTrimmed(actionConf, GitActionExecutor.NAME_NODE);
+        destinationUri = checkAndGetTrimmed(actionConf, 
GitActionExecutor.DESTINATION_URI);
         try {
             final FileSystem fs = FileSystem.get(isValidUri(destinationUri), 
actionConf);
             destinationUri = fs.makeQualified(new 
Path(destinationUri)).toString();
@@ -190,7 +199,7 @@ public class GitMain extends LauncherMain {
                     + "a valid filesystem for URI " + 
GitActionExecutor.DESTINATION_URI + "exception "
                     + e.toString());
         }
-        gitUri = 
isValidUri(confChecker.checkAndGetTrimmed(GitActionExecutor.GIT_URI)).toString();
+        gitUri = isValidUri(checkAndGetTrimmed(actionConf, 
GitActionExecutor.GIT_URI)).toString();
         gitBranch = actionConf.get(GitActionExecutor.GIT_BRANCH);
         keyPath = actionConf.get(GitActionExecutor.KEY_PATH);
     }