Repository: incubator-ranger Updated Branches: refs/heads/master 00c00253e -> 0699c3401
RANGER-942: Added 'None' as another tag-source Signed-off-by: Madhan Neethiraj <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/incubator-ranger/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ranger/commit/0699c340 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ranger/tree/0699c340 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ranger/diff/0699c340 Branch: refs/heads/master Commit: 0699c3401b2d8615683e871c1f68a7534eea9c5c Parents: 00c0025 Author: Abhay Kulkarni <[email protected]> Authored: Tue Apr 19 14:55:10 2016 -0700 Committer: Madhan Neethiraj <[email protected]> Committed: Thu Apr 21 09:23:14 2016 -0700 ---------------------------------------------------------------------- .../apache/ranger/tagsync/model/TagSource.java | 2 ++ .../ranger/tagsync/process/TagSynchronizer.java | 33 ++++++++++---------- 2 files changed, 18 insertions(+), 17 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/0699c340/tagsync/src/main/java/org/apache/ranger/tagsync/model/TagSource.java ---------------------------------------------------------------------- diff --git a/tagsync/src/main/java/org/apache/ranger/tagsync/model/TagSource.java b/tagsync/src/main/java/org/apache/ranger/tagsync/model/TagSource.java index 5ef6c57..01bc365 100644 --- a/tagsync/src/main/java/org/apache/ranger/tagsync/model/TagSource.java +++ b/tagsync/src/main/java/org/apache/ranger/tagsync/model/TagSource.java @@ -24,6 +24,8 @@ import java.util.Properties; public interface TagSource { + String TAG_SOURCE_NONE = "None"; + boolean initialize(Properties properties); void setTagSink(TagSink sink); http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/0699c340/tagsync/src/main/java/org/apache/ranger/tagsync/process/TagSynchronizer.java ---------------------------------------------------------------------- diff --git a/tagsync/src/main/java/org/apache/ranger/tagsync/process/TagSynchronizer.java b/tagsync/src/main/java/org/apache/ranger/tagsync/process/TagSynchronizer.java index 42d55d1..02fbc2c 100644 --- a/tagsync/src/main/java/org/apache/ranger/tagsync/process/TagSynchronizer.java +++ b/tagsync/src/main/java/org/apache/ranger/tagsync/process/TagSynchronizer.java @@ -19,7 +19,6 @@ package org.apache.ranger.tagsync.process; -import org.apache.commons.collections.CollectionUtils; import org.apache.commons.collections.MapUtils; import org.apache.commons.lang.StringUtils; import org.apache.log4j.Logger; @@ -103,12 +102,10 @@ public class TagSynchronizer { tagSources = initializeTagSources(tagSourceNames, properties); - if (CollectionUtils.isNotEmpty(tagSources)) { - for (TagSource tagSource : tagSources) { - tagSource.setTagSink(tagSink); - } - ret = true; + for (TagSource tagSource : tagSources) { + tagSource.setTagSink(tagSink); } + ret = true; } } else { LOG.error("'ranger.tagsync.source.impl.class' value is not specified or is empty!"); @@ -236,21 +233,23 @@ public class TagSynchronizer { LOG.debug("tagSourceClassName=" + tagSourceClassName); } - @SuppressWarnings("unchecked") - Class<TagSource> tagSourceClass = (Class<TagSource>) Class.forName(tagSourceClassName); - TagSource tagSource = tagSourceClass.newInstance(); + if (!StringUtils.equalsIgnoreCase(tagSourceClassName, TagSource.TAG_SOURCE_NONE)) { + @SuppressWarnings("unchecked") + Class<TagSource> tagSourceClass = (Class<TagSource>) Class.forName(tagSourceClassName); + TagSource tagSource = tagSourceClass.newInstance(); - if (LOG.isDebugEnabled()) { - LOG.debug("Created instance of " + tagSourceClassName); - } + if (LOG.isDebugEnabled()) { + LOG.debug("Created instance of " + tagSourceClassName); + } - if (!tagSource.initialize(properties)) { - LOG.error("Failed to initialize TAG source " + tagSourceClassName); + if (!tagSource.initialize(properties)) { + LOG.error("Failed to initialize TAG source " + tagSourceClassName); - ret.clear(); - break; + ret.clear(); + break; + } + ret.add(tagSource); } - ret.add(tagSource); } } catch (Throwable t) {
