Details
diff --git a/src/java/azkaban/project/ProjectManager.java b/src/java/azkaban/project/ProjectManager.java
index 8db4fe3..a5be083 100644
--- a/src/java/azkaban/project/ProjectManager.java
+++ b/src/java/azkaban/project/ProjectManager.java
@@ -50,8 +50,6 @@ public class ProjectManager {
private final int projectVersionRetention;
private final boolean creatorDefaultPermissions;
- private boolean loadTriggerFromFile = false;
-
public ProjectManager(ProjectLoader loader, Props props) {
this.projectLoader = loader;
this.props = props;
@@ -61,8 +59,6 @@ public class ProjectManager {
this.creatorDefaultPermissions = props.getBoolean("creator.default.proxy", true);
- this.loadTriggerFromFile = props.getBoolean("enable.load.trigger.from.file", false);
-
if (!tempDir.exists()) {
tempDir.mkdirs();
}
@@ -70,10 +66,6 @@ public class ProjectManager {
loadAllProjects();
}
- public void setLoadTriggerFromFile(boolean enable) {
- this.loadTriggerFromFile = enable;
- }
-
private void loadAllProjects() {
List<Project> projects;
try {
diff --git a/src/java/azkaban/trigger/ActionTypeLoader.java b/src/java/azkaban/trigger/ActionTypeLoader.java
index 720a2b2..2efdf99 100644
--- a/src/java/azkaban/trigger/ActionTypeLoader.java
+++ b/src/java/azkaban/trigger/ActionTypeLoader.java
@@ -30,8 +30,6 @@ public class ActionTypeLoader {
private static Logger logger = Logger.getLogger(ActionTypeLoader.class);
public static final String DEFAULT_TRIGGER_ACTION_PLUGIN_DIR = "plugins/triggeractions";
- private static final String ACTIONTYPECONFFILE = "plugin.properties"; // need jars.to.include property, will be loaded with user property
- private static final String COMMONCONFFILE = "common.properties"; // common properties for multiple plugins
protected static Map<String, Class<? extends TriggerAction>> actionToClass = new HashMap<String, Class<? extends TriggerAction>>();
diff --git a/src/java/azkaban/trigger/builtin/CreateTriggerAction.java b/src/java/azkaban/trigger/builtin/CreateTriggerAction.java
index 8ddb32f..ad86c3f 100644
--- a/src/java/azkaban/trigger/builtin/CreateTriggerAction.java
+++ b/src/java/azkaban/trigger/builtin/CreateTriggerAction.java
@@ -28,6 +28,7 @@ public class CreateTriggerAction implements TriggerAction {
public static final String type = "CreateTriggerAction";
private static TriggerManager triggerManager;
private Trigger trigger;
+ @SuppressWarnings("unused")
private Map<String, Object> context;
private String actionId;
diff --git a/src/java/azkaban/trigger/CheckerTypeLoader.java b/src/java/azkaban/trigger/CheckerTypeLoader.java
index e72b4a5..7c02bed 100644
--- a/src/java/azkaban/trigger/CheckerTypeLoader.java
+++ b/src/java/azkaban/trigger/CheckerTypeLoader.java
@@ -30,8 +30,6 @@ public class CheckerTypeLoader {
private static Logger logger = Logger.getLogger(CheckerTypeLoader.class);
public static final String DEFAULT_CONDITION_CHECKER_PLUGIN_DIR = "plugins/conditioncheckers";
- private static final String CHECKERTYPECONFFILE = "plugin.properties"; // need jars.to.include property, will be loaded with user property
- private static final String COMMONCONFFILE = "common.properties"; // common properties for multiple plugins
protected static Map<String, Class<? extends ConditionChecker>> checkerToClass = new HashMap<String, Class<? extends ConditionChecker>>();
diff --git a/unit/java/azkaban/test/database/AzkabanDatabaseSetupTest.java b/unit/java/azkaban/test/database/AzkabanDatabaseSetupTest.java
index 23d548c..0b2bd48 100644
--- a/unit/java/azkaban/test/database/AzkabanDatabaseSetupTest.java
+++ b/unit/java/azkaban/test/database/AzkabanDatabaseSetupTest.java
@@ -6,11 +6,10 @@ import java.sql.SQLException;
import javax.sql.DataSource;
-import junit.framework.Assert;
-
import org.apache.commons.dbutils.QueryRunner;
import org.apache.commons.io.FileUtils;
import org.junit.AfterClass;
+import org.junit.Assert;
import org.junit.BeforeClass;
import org.junit.Test;
diff --git a/unit/java/azkaban/test/execapp/event/BlockingStatusTest.java b/unit/java/azkaban/test/execapp/event/BlockingStatusTest.java
index 3acd91b..124f9a0 100644
--- a/unit/java/azkaban/test/execapp/event/BlockingStatusTest.java
+++ b/unit/java/azkaban/test/execapp/event/BlockingStatusTest.java
@@ -1,8 +1,8 @@
package azkaban.test.execapp.event;
+import org.junit.Assert;
import org.junit.Test;
-import junit.framework.Assert;
import azkaban.execapp.event.BlockingStatus;
import azkaban.executor.Status;
diff --git a/unit/java/azkaban/test/execapp/FlowRunnerTest.java b/unit/java/azkaban/test/execapp/FlowRunnerTest.java
index da1ed27..7628c13 100644
--- a/unit/java/azkaban/test/execapp/FlowRunnerTest.java
+++ b/unit/java/azkaban/test/execapp/FlowRunnerTest.java
@@ -4,10 +4,9 @@ import java.io.File;
import java.io.IOException;
import java.util.HashMap;
-import junit.framework.Assert;
-
import org.apache.commons.io.FileUtils;
import org.junit.After;
+import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
diff --git a/unit/java/azkaban/test/execapp/JobRunnerTest.java b/unit/java/azkaban/test/execapp/JobRunnerTest.java
index 1f8edc2..02f35ae 100644
--- a/unit/java/azkaban/test/execapp/JobRunnerTest.java
+++ b/unit/java/azkaban/test/execapp/JobRunnerTest.java
@@ -4,11 +4,10 @@ import java.io.File;
import java.io.IOException;
import java.util.HashSet;
-import junit.framework.Assert;
-
import org.apache.commons.io.FileUtils;
import org.apache.log4j.Logger;
import org.junit.After;
+import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
diff --git a/unit/java/azkaban/test/execapp/ProjectVersionsTest.java b/unit/java/azkaban/test/execapp/ProjectVersionsTest.java
index 5a0a31b..9120729 100644
--- a/unit/java/azkaban/test/execapp/ProjectVersionsTest.java
+++ b/unit/java/azkaban/test/execapp/ProjectVersionsTest.java
@@ -3,8 +3,7 @@ package azkaban.test.execapp;
import java.util.ArrayList;
import java.util.Collections;
-import junit.framework.Assert;
-
+import org.junit.Assert;
import org.junit.Test;
import azkaban.execapp.ProjectVersion;
diff --git a/unit/java/azkaban/test/executor/JdbcExecutorLoaderTest.java b/unit/java/azkaban/test/executor/JdbcExecutorLoaderTest.java
index ba89a20..302eaac 100644
--- a/unit/java/azkaban/test/executor/JdbcExecutorLoaderTest.java
+++ b/unit/java/azkaban/test/executor/JdbcExecutorLoaderTest.java
@@ -6,17 +6,16 @@ import java.sql.Connection;
import java.sql.ResultSet;
import java.sql.SQLException;
import java.util.HashMap;
-import java.util.HashSet;
+import java.util.HashSet;
import java.util.Map;
import javax.sql.DataSource;
-import junit.framework.Assert;
-
import org.apache.commons.dbutils.DbUtils;
import org.apache.commons.dbutils.QueryRunner;
import org.apache.commons.dbutils.ResultSetHandler;
import org.joda.time.DateTime;
+import org.junit.Assert;
import org.junit.BeforeClass;
import org.junit.Test;
diff --git a/unit/java/azkaban/test/project/JdbcProjectLoaderTest.java b/unit/java/azkaban/test/project/JdbcProjectLoaderTest.java
index 85f874c..0de4121 100644
--- a/unit/java/azkaban/test/project/JdbcProjectLoaderTest.java
+++ b/unit/java/azkaban/test/project/JdbcProjectLoaderTest.java
@@ -9,15 +9,13 @@ import java.util.List;
import javax.sql.DataSource;
-import junit.framework.Assert;
-
import org.apache.commons.dbutils.DbUtils;
import org.apache.commons.dbutils.QueryRunner;
import org.apache.commons.dbutils.ResultSetHandler;
+import org.junit.Assert;
import org.junit.BeforeClass;
import org.junit.Test;
-
import azkaban.flow.Edge;
import azkaban.flow.Flow;
import azkaban.flow.Node;
diff --git a/unit/java/azkaban/test/trigger/ConditionTest.java b/unit/java/azkaban/test/trigger/ConditionTest.java
index b4b87e6..76ced5e 100644
--- a/unit/java/azkaban/test/trigger/ConditionTest.java
+++ b/unit/java/azkaban/test/trigger/ConditionTest.java
@@ -73,7 +73,6 @@ public class ConditionTest {
Condition cond2 = Condition.fromJson(JSONUtils.parseJSONFromFile(temp));
- Map<String, ConditionChecker> checkers1 = cond.getCheckers();
Map<String, ConditionChecker> checkers2 = cond2.getCheckers();
assertTrue(cond.getExpression().equals(cond2.getExpression()));
diff --git a/unit/java/azkaban/test/trigger/JdbcTriggerLoaderTest.java b/unit/java/azkaban/test/trigger/JdbcTriggerLoaderTest.java
index d8b1d00..61f2ae7 100644
--- a/unit/java/azkaban/test/trigger/JdbcTriggerLoaderTest.java
+++ b/unit/java/azkaban/test/trigger/JdbcTriggerLoaderTest.java
@@ -199,16 +199,6 @@ public class JdbcTriggerLoaderTest {
return t;
}
- private boolean isTestSetup() {
- if (!testDBExists) {
- System.err.println("Skipping DB test because Db not setup.");
- return false;
- }
-
- System.out.println("Running DB test because Db setup.");
- return true;
- }
-
public static class CountHandler implements ResultSetHandler<Integer> {
@Override
public Integer handle(ResultSet rs) throws SQLException {
diff --git a/unit/java/azkaban/test/utils/cache/CacheTest.java b/unit/java/azkaban/test/utils/cache/CacheTest.java
index bc5e2b9..3fcc0f9 100644
--- a/unit/java/azkaban/test/utils/cache/CacheTest.java
+++ b/unit/java/azkaban/test/utils/cache/CacheTest.java
@@ -1,7 +1,6 @@
package azkaban.test.utils.cache;
-import junit.framework.Assert;
-
+import org.junit.Assert;
import org.junit.Test;
import azkaban.utils.cache.Cache;
diff --git a/unit/java/azkaban/test/utils/FileIOUtilsTest.java b/unit/java/azkaban/test/utils/FileIOUtilsTest.java
index 241162e..3157663 100644
--- a/unit/java/azkaban/test/utils/FileIOUtilsTest.java
+++ b/unit/java/azkaban/test/utils/FileIOUtilsTest.java
@@ -4,10 +4,9 @@ import java.io.File;
import java.io.IOException;
import java.io.UnsupportedEncodingException;
-import junit.framework.Assert;
-
import org.apache.commons.io.FileUtils;
import org.junit.After;
+import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
diff --git a/unit/java/azkaban/test/utils/JsonUtilsTest.java b/unit/java/azkaban/test/utils/JsonUtilsTest.java
index 87c81e9..c12f17c 100644
--- a/unit/java/azkaban/test/utils/JsonUtilsTest.java
+++ b/unit/java/azkaban/test/utils/JsonUtilsTest.java
@@ -5,8 +5,7 @@ import java.io.StringWriter;
import java.util.HashMap;
import java.util.Map;
-import junit.framework.Assert;
-
+import org.junit.Assert;
import org.junit.Test;
import azkaban.utils.JSONUtils;
diff --git a/unit/java/azkaban/test/utils/PropsUtilsTest.java b/unit/java/azkaban/test/utils/PropsUtilsTest.java
index e2c914f..1623005 100644
--- a/unit/java/azkaban/test/utils/PropsUtilsTest.java
+++ b/unit/java/azkaban/test/utils/PropsUtilsTest.java
@@ -2,8 +2,7 @@ package azkaban.test.utils;
import java.io.IOException;
-import junit.framework.Assert;
-
+import org.junit.Assert;
import org.junit.Test;
import azkaban.utils.Props;
@@ -88,7 +87,6 @@ public class PropsUtilsTest {
private void failIfNotException(Props props) {
try {
- Props resolved = PropsUtils.resolveProps(props);
Assert.fail();
}
catch (UndefinedPropertyException e) {
