Repository: incubator-ranger Updated Branches: refs/heads/master 59b49610a -> 3e59571c6
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/3e59571c/ranger_solrj/src/main/java/org/apache/solr/common/params/TermsParams.java ---------------------------------------------------------------------- diff --git a/ranger_solrj/src/main/java/org/apache/solr/common/params/TermsParams.java b/ranger_solrj/src/main/java/org/apache/solr/common/params/TermsParams.java index 9558efc..63d1d28 100644 --- a/ranger_solrj/src/main/java/org/apache/solr/common/params/TermsParams.java +++ b/ranger_solrj/src/main/java/org/apache/solr/common/params/TermsParams.java @@ -27,53 +27,53 @@ public interface TermsParams { /** * The component name. Set to true to turn on the TermsComponent */ - public static final String TERMS = "terms"; + String TERMS = "terms"; /** * Used for building up the other terms */ - public static final String TERMS_PREFIX = TERMS + "."; + String TERMS_PREFIX = TERMS + "."; /** * Required. Specify the field to look up terms in. */ - public static final String TERMS_FIELD = TERMS_PREFIX + "fl"; + String TERMS_FIELD = TERMS_PREFIX + "fl"; /** * Optional. The lower bound term to start at. The TermEnum will start at the next term after this term in the dictionary. * * If not specified, the empty string is used */ - public static final String TERMS_LOWER = TERMS_PREFIX + "lower"; + String TERMS_LOWER = TERMS_PREFIX + "lower"; /** * Optional. The term to stop at. * * @see #TERMS_UPPER_INCLUSIVE */ - public static final String TERMS_UPPER = TERMS_PREFIX + "upper"; + String TERMS_UPPER = TERMS_PREFIX + "upper"; /** * Optional. If true, include the upper bound term in the results. False by default. */ - public static final String TERMS_UPPER_INCLUSIVE = TERMS_PREFIX + "upper.incl"; + String TERMS_UPPER_INCLUSIVE = TERMS_PREFIX + "upper.incl"; /** * Optional. If true, include the lower bound term in the results, otherwise skip to the next one. True by default. */ - public static final String TERMS_LOWER_INCLUSIVE = TERMS_PREFIX + "lower.incl"; + String TERMS_LOWER_INCLUSIVE = TERMS_PREFIX + "lower.incl"; /** * Optional. The number of results to return. If not specified, looks for {@link org.apache.solr.common.params.CommonParams#ROWS}. If that's not specified, uses 10. */ - public static final String TERMS_LIMIT = TERMS_PREFIX + "limit"; + String TERMS_LIMIT = TERMS_PREFIX + "limit"; - public static final String TERMS_PREFIX_STR = TERMS_PREFIX + "prefix"; + String TERMS_PREFIX_STR = TERMS_PREFIX + "prefix"; - public static final String TERMS_REGEXP_STR = TERMS_PREFIX + "regex"; + String TERMS_REGEXP_STR = TERMS_PREFIX + "regex"; - public static final String TERMS_REGEXP_FLAG = TERMS_REGEXP_STR + ".flag"; + String TERMS_REGEXP_FLAG = TERMS_REGEXP_STR + ".flag"; - public static enum TermsRegexpFlag { + static enum TermsRegexpFlag { UNIX_LINES(Pattern.UNIX_LINES), CASE_INSENSITIVE(Pattern.CASE_INSENSITIVE), COMMENTS(Pattern.COMMENTS), @@ -89,7 +89,7 @@ public interface TermsParams { this.value = value; } - public int getValue() { + int getValue() { return value; } } @@ -97,24 +97,24 @@ public interface TermsParams { /** * Optional. The minimum value of docFreq to be returned. 1 by default */ - public static final String TERMS_MINCOUNT = TERMS_PREFIX + "mincount"; + String TERMS_MINCOUNT = TERMS_PREFIX + "mincount"; /** * Optional. The maximum value of docFreq to be returned. -1 by default means no boundary */ - public static final String TERMS_MAXCOUNT = TERMS_PREFIX + "maxcount"; + String TERMS_MAXCOUNT = TERMS_PREFIX + "maxcount"; /** * Optional. If true, return the raw characters of the indexed term, regardless of if it is readable. * For instance, the index form of numeric numbers is not human readable. The default is false. */ - public static final String TERMS_RAW = TERMS_PREFIX + "raw"; + String TERMS_RAW = TERMS_PREFIX + "raw"; /** * Optional. If sorting by frequency is enabled. Defaults to sorting by count. */ - public static final String TERMS_SORT = TERMS_PREFIX + "sort"; + String TERMS_SORT = TERMS_PREFIX + "sort"; - public static final String TERMS_SORT_COUNT = "count"; - public static final String TERMS_SORT_INDEX = "index"; + String TERMS_SORT_COUNT = "count"; + String TERMS_SORT_INDEX = "index"; } http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/3e59571c/ranger_solrj/src/main/java/org/apache/solr/common/params/UpdateParams.java ---------------------------------------------------------------------- diff --git a/ranger_solrj/src/main/java/org/apache/solr/common/params/UpdateParams.java b/ranger_solrj/src/main/java/org/apache/solr/common/params/UpdateParams.java index cf965a9..75f8857 100644 --- a/ranger_solrj/src/main/java/org/apache/solr/common/params/UpdateParams.java +++ b/ranger_solrj/src/main/java/org/apache/solr/common/params/UpdateParams.java @@ -27,46 +27,46 @@ public interface UpdateParams { /** Open up a new searcher as part of a commit */ - public static String OPEN_SEARCHER = "openSearcher"; + String OPEN_SEARCHER = "openSearcher"; /** wait for the searcher to be registered/visible */ - public static String WAIT_SEARCHER = "waitSearcher"; + String WAIT_SEARCHER = "waitSearcher"; - public static String SOFT_COMMIT = "softCommit"; + String SOFT_COMMIT = "softCommit"; /** overwrite indexing fields */ - public static String OVERWRITE = "overwrite"; + String OVERWRITE = "overwrite"; /** Commit everything after the command completes */ - public static String COMMIT = "commit"; + String COMMIT = "commit"; /** Commit within a certain time period (in ms) */ - public static String COMMIT_WITHIN = "commitWithin"; + String COMMIT_WITHIN = "commitWithin"; /** Optimize the index and commit everything after the command completes */ - public static String OPTIMIZE = "optimize"; + String OPTIMIZE = "optimize"; /** expert: calls IndexWriter.prepareCommit */ - public static String PREPARE_COMMIT = "prepareCommit"; + String PREPARE_COMMIT = "prepareCommit"; /** Rollback update commands */ - public static String ROLLBACK = "rollback"; + String ROLLBACK = "rollback"; - public static String COLLECTION = "collection"; + String COLLECTION = "collection"; /** Select the update processor chain to use. A RequestHandler may or may not respect this parameter */ - public static final String UPDATE_CHAIN = "update.chain"; + String UPDATE_CHAIN = "update.chain"; /** Override the content type used for UpdateLoader **/ - public static final String ASSUME_CONTENT_TYPE = "update.contentType"; + String ASSUME_CONTENT_TYPE = "update.contentType"; /** * If optimizing, set the maximum number of segments left in the index after optimization. 1 is the default (and is equivalent to calling IndexWriter.optimize() in Lucene). */ - public static final String MAX_OPTIMIZE_SEGMENTS = "maxSegments"; + String MAX_OPTIMIZE_SEGMENTS = "maxSegments"; - public static final String EXPUNGE_DELETES = "expungeDeletes"; + String EXPUNGE_DELETES = "expungeDeletes"; /** Return versions of updates? */ - public static final String VERSIONS = "versions"; + String VERSIONS = "versions"; } http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/3e59571c/ranger_solrj/src/main/java/org/apache/solr/common/util/RetryUtil.java ---------------------------------------------------------------------- diff --git a/ranger_solrj/src/main/java/org/apache/solr/common/util/RetryUtil.java b/ranger_solrj/src/main/java/org/apache/solr/common/util/RetryUtil.java index 83ee100..097bd30 100644 --- a/ranger_solrj/src/main/java/org/apache/solr/common/util/RetryUtil.java +++ b/ranger_solrj/src/main/java/org/apache/solr/common/util/RetryUtil.java @@ -20,8 +20,8 @@ package org.apache.solr.common.util; import java.util.concurrent.TimeUnit; public class RetryUtil { - public static interface RetryCmd { - public void execute() throws Throwable; + interface RetryCmd { + void execute() throws Throwable; } public static void retryOnThrowable(Class clazz, long timeoutms, long intervalms, RetryCmd cmd) throws Throwable { http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/3e59571c/security-admin/src/main/java/org/apache/ranger/common/MyCallBack.java ---------------------------------------------------------------------- diff --git a/security-admin/src/main/java/org/apache/ranger/common/MyCallBack.java b/security-admin/src/main/java/org/apache/ranger/common/MyCallBack.java index f10c40c..acbc3a7 100644 --- a/security-admin/src/main/java/org/apache/ranger/common/MyCallBack.java +++ b/security-admin/src/main/java/org/apache/ranger/common/MyCallBack.java @@ -30,5 +30,5 @@ public interface MyCallBack { * @Override * @Transactional(readOnly = false, propagation = Propagation.REQUIRES_NEW) */ - public Object process(Object data); + Object process(Object data); } http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/3e59571c/ugsync/src/main/java/org/apache/ranger/usergroupsync/Mapper.java ---------------------------------------------------------------------- diff --git a/ugsync/src/main/java/org/apache/ranger/usergroupsync/Mapper.java b/ugsync/src/main/java/org/apache/ranger/usergroupsync/Mapper.java index 820fe20..94675da 100644 --- a/ugsync/src/main/java/org/apache/ranger/usergroupsync/Mapper.java +++ b/ugsync/src/main/java/org/apache/ranger/usergroupsync/Mapper.java @@ -20,7 +20,7 @@ package org.apache.ranger.usergroupsync; public interface Mapper { - public void init(String baseProperty); + void init(String baseProperty); - public String transform(String attrValue); + String transform(String attrValue); } http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/3e59571c/ugsync/src/main/java/org/apache/ranger/usergroupsync/UserGroupSink.java ---------------------------------------------------------------------- diff --git a/ugsync/src/main/java/org/apache/ranger/usergroupsync/UserGroupSink.java b/ugsync/src/main/java/org/apache/ranger/usergroupsync/UserGroupSink.java index c9b5f1a..9ee6d95 100644 --- a/ugsync/src/main/java/org/apache/ranger/usergroupsync/UserGroupSink.java +++ b/ugsync/src/main/java/org/apache/ranger/usergroupsync/UserGroupSink.java @@ -22,9 +22,9 @@ import java.util.List; public interface UserGroupSink { - public void init() throws Throwable; + void init() throws Throwable; - public void addOrUpdateUser(String user, List<String> groups); + void addOrUpdateUser(String user, List<String> groups); - public void addOrUpdateGroup(String group); + void addOrUpdateGroup(String group); } http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/3e59571c/ugsync/src/main/java/org/apache/ranger/usergroupsync/UserGroupSource.java ---------------------------------------------------------------------- diff --git a/ugsync/src/main/java/org/apache/ranger/usergroupsync/UserGroupSource.java b/ugsync/src/main/java/org/apache/ranger/usergroupsync/UserGroupSource.java index 6dbb83d..776cdcb 100644 --- a/ugsync/src/main/java/org/apache/ranger/usergroupsync/UserGroupSource.java +++ b/ugsync/src/main/java/org/apache/ranger/usergroupsync/UserGroupSource.java @@ -21,9 +21,9 @@ public interface UserGroupSource { - public void init() throws Throwable; + void init() throws Throwable; - public boolean isChanged(); + boolean isChanged(); - public void updateSink(UserGroupSink sink) throws Throwable; + void updateSink(UserGroupSink sink) throws Throwable; }
