Findbugs & long lines Change-Id: Ic65a7ebc3f76dfe0d9f8bc2f4272f898c3e96b46
Project: http://git-wip-us.apache.org/repos/asf/oozie/repo Commit: http://git-wip-us.apache.org/repos/asf/oozie/commit/e19dd196 Tree: http://git-wip-us.apache.org/repos/asf/oozie/tree/e19dd196 Diff: http://git-wip-us.apache.org/repos/asf/oozie/diff/e19dd196 Branch: refs/heads/oya Commit: e19dd196f0e13540fdc309cbbd6fd08195971f4c Parents: 3c2ede4 Author: Peter Bacsko <[email protected]> Authored: Mon Jan 23 18:41:44 2017 +0100 Committer: Peter Bacsko <[email protected]> Committed: Mon Jan 23 18:41:44 2017 +0100 ---------------------------------------------------------------------- .../hadoop/CredentialsProviderFactory.java | 7 ++--- .../oozie/action/hadoop/JavaActionExecutor.java | 7 ++--- core/src/main/resources/oozie-log4j.properties | 27 ++++++++++++++++++-- .../hadoop/TestMapReduceActionExecutor.java | 9 ++++--- 4 files changed, 39 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/oozie/blob/e19dd196/core/src/main/java/org/apache/oozie/action/hadoop/CredentialsProviderFactory.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/oozie/action/hadoop/CredentialsProviderFactory.java b/core/src/main/java/org/apache/oozie/action/hadoop/CredentialsProviderFactory.java index fc907c4..aa849ad 100644 --- a/core/src/main/java/org/apache/oozie/action/hadoop/CredentialsProviderFactory.java +++ b/core/src/main/java/org/apache/oozie/action/hadoop/CredentialsProviderFactory.java @@ -47,7 +47,7 @@ public class CredentialsProviderFactory { String type; String classname; for (String function : ConfigurationService.getStrings(CRED_KEY)) { - function = Trim(function); + function = trim(function); LOG.debug("Creating Credential class for : " + function); String[] str = function.split("="); if (str.length > 0) { @@ -75,7 +75,8 @@ public class CredentialsProviderFactory { /** * Relogs into Kerberos using the Keytab for the Oozie server user. This should be called before attempting to get delegation - * tokens via {@link CredentialsProvider} implementations to ensure that the Kerberos credentials are current and won't expire too soon. + * tokens via {@link CredentialsProvider} implementations to ensure that the Kerberos credentials are current and won't expire + * too soon. * * @throws IOException */ @@ -91,7 +92,7 @@ public class CredentialsProviderFactory { * @param str * @return trim string */ - public String Trim(String str) { + public String trim(String str) { if (str != null) { str = str.replaceAll("\\n", ""); str = str.replaceAll("\\t", ""); http://git-wip-us.apache.org/repos/asf/oozie/blob/e19dd196/core/src/main/java/org/apache/oozie/action/hadoop/JavaActionExecutor.java ---------------------------------------------------------------------- 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 4b9b16d..3a05730 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 @@ -772,8 +772,8 @@ public class JavaActionExecutor extends ActionExecutor { } @SuppressWarnings("unchecked") - Configuration createLauncherConf(FileSystem actionFs, Context context, WorkflowAction action, Element actionXml, Configuration actionConf) - throws ActionExecutorException { + Configuration createLauncherConf(FileSystem actionFs, Context context, WorkflowAction action, Element actionXml, + Configuration actionConf) throws ActionExecutorException { try { // app path could be a file @@ -1019,7 +1019,8 @@ public class JavaActionExecutor extends ActionExecutor { YarnClientApplication newApp = yarnClient.createApplication(); ApplicationId appId = newApp.getNewApplicationResponse().getApplicationId(); ApplicationSubmissionContext appContext = - createAppSubmissionContext(appId, launcherJobConf, user, context, actionConf, action.getName(), credentials); + createAppSubmissionContext(appId, launcherJobConf, user, context, actionConf, action.getName(), + credentials); yarnClient.submitApplication(appContext); launcherId = appId.toString(); http://git-wip-us.apache.org/repos/asf/oozie/blob/e19dd196/core/src/main/resources/oozie-log4j.properties ---------------------------------------------------------------------- diff --git a/core/src/main/resources/oozie-log4j.properties b/core/src/main/resources/oozie-log4j.properties index cc44afb..c86b301 100644 --- a/core/src/main/resources/oozie-log4j.properties +++ b/core/src/main/resources/oozie-log4j.properties @@ -25,11 +25,34 @@ # limitations under the License. See accompanying LICENSE file. # + log4j.appender.test=org.apache.log4j.ConsoleAppender log4j.appender.test.Target=System.out log4j.appender.test.layout=org.apache.log4j.PatternLayout -log4j.appender.test.layout.ConversionPattern=%d{ABSOLUTE} [%t] %5p %c{1}:%L - %m%n +log4j.appender.test.layout.ConversionPattern=%d{ABSOLUTE} %5p %c{1}:%L - %m%n log4j.appender.none=org.apache.log4j.varia.NullAppender -log4j.rootLogger=DEBUG, test +log4j.logger.oozieops=NONE, none +log4j.logger.oozieinstrumentation=NONE, none +log4j.logger.oozieaudit=NONE, none + +log4j.logger.org.apache.oozie.local=DEBUG, test +log4j.logger.org.apache.oozie.client=DEBUG, test +log4j.logger.org.apache.oozie.test=DEBUG, test +log4j.logger.org.apache.oozie.dependency=DEBUG, test +log4j.logger.org.apache.oozie.wf=DEBUG, test +log4j.logger.org.apache.oozie.action=DEBUG, test +log4j.logger.org.apache.oozie.command=DEBUG, test +log4j.logger.org.apache.oozie.wf.service=INFO, test +log4j.logger.org.apache.oozie.wf.servlet=INFO, test +log4j.logger.org.apache.oozie.store=DEBUG, test +log4j.logger.org.apache.oozie.workflow=DEBUG, test +log4j.logger.org.apache.oozie.service=DEBUG, test +log4j.logger.org.apache.oozie.servlet=INFO, test +log4j.logger.org.apache.oozie.sla=DEBUG, test +log4j.logger.org.apache.hadoop=INFO, test +log4j.logger.org.mortbay=INFO, test +log4j.logger.org.hsqldb=INFO, test + + http://git-wip-us.apache.org/repos/asf/oozie/blob/e19dd196/sharelib/streaming/src/test/java/org/apache/oozie/action/hadoop/TestMapReduceActionExecutor.java ---------------------------------------------------------------------- diff --git a/sharelib/streaming/src/test/java/org/apache/oozie/action/hadoop/TestMapReduceActionExecutor.java b/sharelib/streaming/src/test/java/org/apache/oozie/action/hadoop/TestMapReduceActionExecutor.java index bb0a366..6b9bd15 100644 --- a/sharelib/streaming/src/test/java/org/apache/oozie/action/hadoop/TestMapReduceActionExecutor.java +++ b/sharelib/streaming/src/test/java/org/apache/oozie/action/hadoop/TestMapReduceActionExecutor.java @@ -250,12 +250,14 @@ public class TestMapReduceActionExecutor extends ActionExecutorTestCase { actionXml = createUberJarActionXML(getNameNodeUri() + "/app/job.jar", ""); conf = ae.createBaseHadoopConf(context, actionXml); ae.setupActionConf(conf, context, actionXml, getFsTestCaseDir()); - assertEquals(getNameNodeUri() + "/app/job.jar", conf.get(MapReduceMain.OOZIE_MAPREDUCE_UBER_JAR)); // absolute path with namenode + // absolute path with namenode + assertEquals(getNameNodeUri() + "/app/job.jar", conf.get(MapReduceMain.OOZIE_MAPREDUCE_UBER_JAR)); actionXml = createUberJarActionXML("/app/job.jar", ""); conf = ae.createBaseHadoopConf(context, actionXml); ae.setupActionConf(conf, context, actionXml, getFsTestCaseDir()); - assertEquals(getNameNodeUri() + "/app/job.jar", conf.get(MapReduceMain.OOZIE_MAPREDUCE_UBER_JAR)); // absolute path without namenode + // absolute path without namenode + assertEquals(getNameNodeUri() + "/app/job.jar", conf.get(MapReduceMain.OOZIE_MAPREDUCE_UBER_JAR)); actionXml = createUberJarActionXML("job.jar", ""); conf = ae.createBaseHadoopConf(context, actionXml); @@ -265,7 +267,8 @@ public class TestMapReduceActionExecutor extends ActionExecutorTestCase { actionXml = createUberJarActionXML("job.jar", "<streaming></streaming>"); conf = ae.createBaseHadoopConf(context, actionXml); ae.setupActionConf(conf, context, actionXml, getFsTestCaseDir()); - assertEquals("", conf.get(MapReduceMain.OOZIE_MAPREDUCE_UBER_JAR)); // ignored for streaming + // ignored for streaming + assertEquals("", conf.get(MapReduceMain.OOZIE_MAPREDUCE_UBER_JAR)); actionXml = createUberJarActionXML("job.jar", "<pipes></pipes>"); conf = ae.createBaseHadoopConf(context, actionXml);
