azkaban-developers

Change the name and comment of the method that fetches the name

10/7/2014 11:00:48 PM

Details

diff --git a/azkaban-common/src/main/java/azkaban/project/validator/ProjectValidator.java b/azkaban-common/src/main/java/azkaban/project/validator/ProjectValidator.java
index 4cdd512..b1b10b8 100644
--- a/azkaban-common/src/main/java/azkaban/project/validator/ProjectValidator.java
+++ b/azkaban-common/src/main/java/azkaban/project/validator/ProjectValidator.java
@@ -19,11 +19,11 @@ public interface ProjectValidator {
   boolean initialize(Props configuration);
 
   /**
-   * Return the name of the validator.
+   * Return a user friendly name of the validator.
    *
    * @return
    */
-  String getValidatorInfo();
+  String getValidatorName();
 
   /**
    * Validate the project inside the given directory. The validator, using its own
diff --git a/azkaban-common/src/main/java/azkaban/project/validator/XmlValidatorManager.java b/azkaban-common/src/main/java/azkaban/project/validator/XmlValidatorManager.java
index 8313dd4..9d68983 100644
--- a/azkaban-common/src/main/java/azkaban/project/validator/XmlValidatorManager.java
+++ b/azkaban-common/src/main/java/azkaban/project/validator/XmlValidatorManager.java
@@ -106,7 +106,7 @@ public class XmlValidatorManager implements ValidatorManager {
     validators = new LinkedHashMap<String, ProjectValidator>();
     // Add the default validator
     DirectoryFlowLoader flowLoader = new DirectoryFlowLoader(log);
-    validators.put(flowLoader.getValidatorInfo(), flowLoader);
+    validators.put(flowLoader.getValidatorName(), flowLoader);
 
     if (!props.containsKey(XML_FILE_PARAM)) {
       logger.warn("Azkaban properties file does not contain the key " + XML_FILE_PARAM);
@@ -179,7 +179,7 @@ public class XmlValidatorManager implements ValidatorManager {
           validatorClass.getConstructor(Logger.class);
       ProjectValidator validator = (ProjectValidator) validatorConstructor.newInstance(log);
       validator.initialize(props);
-      validators.put(validator.getValidatorInfo(), validator);
+      validators.put(validator.getValidatorName(), validator);
       logger.info("Added validator " + className + " to list of validators.");
     } catch (Exception e) {
       logger.error("Could not instantiate ProjectValidator " + className);
diff --git a/azkaban-common/src/main/java/azkaban/utils/DirectoryFlowLoader.java b/azkaban-common/src/main/java/azkaban/utils/DirectoryFlowLoader.java
index 5d27850..0ccd1dc 100644
--- a/azkaban-common/src/main/java/azkaban/utils/DirectoryFlowLoader.java
+++ b/azkaban-common/src/main/java/azkaban/utils/DirectoryFlowLoader.java
@@ -406,7 +406,7 @@ public class DirectoryFlowLoader implements ProjectValidator {
   }
 
   @Override
-  public String getValidatorInfo() {
+  public String getValidatorName() {
     return XmlValidatorManager.DEFAULT_VALIDATOR_KEY;
   }