RANGER-905 - Fix UnusedModifier issues Signed-off-by: Alok Lal <[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/3e59571c Tree: http://git-wip-us.apache.org/repos/asf/incubator-ranger/tree/3e59571c Diff: http://git-wip-us.apache.org/repos/asf/incubator-ranger/diff/3e59571c Branch: refs/heads/master Commit: 3e59571c65e4bfc66f2f753cc9adabdd9451d3c4 Parents: 59b4961 Author: Colm O hEigeartaigh <[email protected]> Authored: Sun Apr 3 22:17:45 2016 -0700 Committer: Alok Lal <[email protected]> Committed: Sun Apr 3 22:25:12 2016 -0700 ---------------------------------------------------------------------- .../ranger/audit/provider/AuditHandler.java | 24 ++--- .../apache/ranger/audit/provider/LogBuffer.java | 8 +- .../ranger/audit/provider/LogDestination.java | 16 +-- .../policyengine/RangerAccessResource.java | 20 ++-- .../policyevaluator/RangerPolicyEvaluator.java | 6 +- .../RangerPolicyItemEvaluator.java | 10 +- dev-support/ranger-pmd-ruleset.xml | 1 - .../authorization/hbase/HbaseAuthUtils.java | 8 +- .../hadoop/HDFSAccessVerifier.java | 6 +- .../util/outputformatter/JisqlFormatter.java | 12 +-- .../kms/server/KeyAuthorizationKeyProvider.java | 14 +-- .../request/JavaBinUpdateRequestCodec.java | 4 +- .../solr/common/cloud/BeforeReconnect.java | 2 +- .../solr/common/cloud/ClosableThread.java | 4 +- .../apache/solr/common/cloud/OnReconnect.java | 2 +- .../common/cloud/ZkCredentialsProvider.java | 2 +- .../solr/common/params/AnalysisParams.java | 12 +-- .../solr/common/params/CollectionParams.java | 6 +- .../apache/solr/common/params/CommonParams.java | 106 +++++++++---------- .../solr/common/params/CursorMarkParams.java | 6 +- .../apache/solr/common/params/DisMaxParams.java | 28 ++--- .../apache/solr/common/params/EventParams.java | 6 +- .../apache/solr/common/params/ExpandParams.java | 12 +-- .../apache/solr/common/params/FacetParams.java | 96 ++++++++--------- .../apache/solr/common/params/GroupParams.java | 32 +++--- .../solr/common/params/HighlightParams.java | 96 ++++++++--------- .../solr/common/params/MoreLikeThisParams.java | 32 +++--- .../apache/solr/common/params/ShardParams.java | 24 ++--- .../apache/solr/common/params/SimpleParams.java | 24 ++--- .../solr/common/params/SpatialParams.java | 12 +-- .../solr/common/params/SpellingParams.java | 36 +++---- .../apache/solr/common/params/StatsParams.java | 8 +- .../solr/common/params/TermVectorParams.java | 18 ++-- .../apache/solr/common/params/TermsParams.java | 38 +++---- .../apache/solr/common/params/UpdateParams.java | 30 +++--- .../org/apache/solr/common/util/RetryUtil.java | 4 +- .../org/apache/ranger/common/MyCallBack.java | 2 +- .../org/apache/ranger/usergroupsync/Mapper.java | 4 +- .../ranger/usergroupsync/UserGroupSink.java | 6 +- .../ranger/usergroupsync/UserGroupSource.java | 6 +- 40 files changed, 390 insertions(+), 393 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/3e59571c/agents-audit/src/main/java/org/apache/ranger/audit/provider/AuditHandler.java ---------------------------------------------------------------------- diff --git a/agents-audit/src/main/java/org/apache/ranger/audit/provider/AuditHandler.java b/agents-audit/src/main/java/org/apache/ranger/audit/provider/AuditHandler.java index 7b51f1d..4ce31dd 100644 --- a/agents-audit/src/main/java/org/apache/ranger/audit/provider/AuditHandler.java +++ b/agents-audit/src/main/java/org/apache/ranger/audit/provider/AuditHandler.java @@ -24,23 +24,23 @@ import java.util.Properties; import org.apache.ranger.audit.model.AuditEventBase; public interface AuditHandler { - public boolean log(AuditEventBase event); - public boolean log(Collection<AuditEventBase> events); + boolean log(AuditEventBase event); + boolean log(Collection<AuditEventBase> events); - public boolean logJSON(String event); - public boolean logJSON(Collection<String> events); + boolean logJSON(String event); + boolean logJSON(Collection<String> events); - public void init(Properties prop); - public void init(Properties prop, String basePropertyName); - public void start(); - public void stop(); - public void waitToComplete(); - public void waitToComplete(long timeout); + void init(Properties prop); + void init(Properties prop, String basePropertyName); + void start(); + void stop(); + void waitToComplete(); + void waitToComplete(long timeout); /** * Name for this provider. Used only during logging. Uniqueness is not guaranteed */ - public String getName(); + String getName(); - public void flush(); + void flush(); } http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/3e59571c/agents-audit/src/main/java/org/apache/ranger/audit/provider/LogBuffer.java ---------------------------------------------------------------------- diff --git a/agents-audit/src/main/java/org/apache/ranger/audit/provider/LogBuffer.java b/agents-audit/src/main/java/org/apache/ranger/audit/provider/LogBuffer.java index aebef1b..204002d 100644 --- a/agents-audit/src/main/java/org/apache/ranger/audit/provider/LogBuffer.java +++ b/agents-audit/src/main/java/org/apache/ranger/audit/provider/LogBuffer.java @@ -20,13 +20,13 @@ package org.apache.ranger.audit.provider; public interface LogBuffer<T> { - public void start(LogDestination<T> destination); + void start(LogDestination<T> destination); - public void stop(); + void stop(); boolean isAvailable(); - public boolean isEmpty(); + boolean isEmpty(); - public boolean add(T log); + boolean add(T log); } http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/3e59571c/agents-audit/src/main/java/org/apache/ranger/audit/provider/LogDestination.java ---------------------------------------------------------------------- diff --git a/agents-audit/src/main/java/org/apache/ranger/audit/provider/LogDestination.java b/agents-audit/src/main/java/org/apache/ranger/audit/provider/LogDestination.java index d6f87cf..22b3d05 100644 --- a/agents-audit/src/main/java/org/apache/ranger/audit/provider/LogDestination.java +++ b/agents-audit/src/main/java/org/apache/ranger/audit/provider/LogDestination.java @@ -21,26 +21,26 @@ package org.apache.ranger.audit.provider; import org.apache.ranger.audit.model.AuditEventBase; public interface LogDestination<T> { - public void start(); + void start(); - public void stop(); + void stop(); boolean isAvailable(); - public boolean send(AuditEventBase log) throws AuditMessageException; + boolean send(AuditEventBase log) throws AuditMessageException; - public boolean send(AuditEventBase[] logs) throws AuditMessageException; + boolean send(AuditEventBase[] logs) throws AuditMessageException; - public boolean sendStringified(String log) throws AuditMessageException; + boolean sendStringified(String log) throws AuditMessageException; - public boolean sendStringified(String[] logs) throws AuditMessageException; + boolean sendStringified(String[] logs) throws AuditMessageException; - public boolean flush(); + boolean flush(); /** * Name for the destination * * @return */ - public String getName(); + String getName(); } http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/3e59571c/agents-common/src/main/java/org/apache/ranger/plugin/policyengine/RangerAccessResource.java ---------------------------------------------------------------------- diff --git a/agents-common/src/main/java/org/apache/ranger/plugin/policyengine/RangerAccessResource.java b/agents-common/src/main/java/org/apache/ranger/plugin/policyengine/RangerAccessResource.java index 8c1c7c5..0b4b23d 100644 --- a/agents-common/src/main/java/org/apache/ranger/plugin/policyengine/RangerAccessResource.java +++ b/agents-common/src/main/java/org/apache/ranger/plugin/policyengine/RangerAccessResource.java @@ -26,23 +26,23 @@ import org.apache.ranger.plugin.model.RangerServiceDef; public interface RangerAccessResource { - public static final String RESOURCE_SEP = "/"; + String RESOURCE_SEP = "/"; - public abstract String getOwnerUser(); + String getOwnerUser(); - public abstract boolean exists(String name); + boolean exists(String name); - public abstract String getValue(String name); + String getValue(String name); - public RangerServiceDef getServiceDef(); + RangerServiceDef getServiceDef(); - public Set<String> getKeys(); + Set<String> getKeys(); - public String getLeafName(); + String getLeafName(); - public String getAsString(); + String getAsString(); - public Map<String, String> getAsMap(); + Map<String, String> getAsMap(); - public RangerAccessResource getReadOnlyCopy(); + RangerAccessResource getReadOnlyCopy(); } http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/3e59571c/agents-common/src/main/java/org/apache/ranger/plugin/policyevaluator/RangerPolicyEvaluator.java ---------------------------------------------------------------------- diff --git a/agents-common/src/main/java/org/apache/ranger/plugin/policyevaluator/RangerPolicyEvaluator.java b/agents-common/src/main/java/org/apache/ranger/plugin/policyevaluator/RangerPolicyEvaluator.java index 25812a4..1010727 100644 --- a/agents-common/src/main/java/org/apache/ranger/plugin/policyevaluator/RangerPolicyEvaluator.java +++ b/agents-common/src/main/java/org/apache/ranger/plugin/policyevaluator/RangerPolicyEvaluator.java @@ -35,9 +35,9 @@ import org.apache.ranger.plugin.policyengine.RangerResourceAccessInfo; public interface RangerPolicyEvaluator extends Comparable<RangerPolicyEvaluator> { - public static final String EVALUATOR_TYPE_AUTO = "auto"; - public static final String EVALUATOR_TYPE_OPTIMIZED = "optimized"; - public static final String EVALUATOR_TYPE_CACHED = "cached"; + String EVALUATOR_TYPE_AUTO = "auto"; + String EVALUATOR_TYPE_OPTIMIZED = "optimized"; + String EVALUATOR_TYPE_CACHED = "cached"; void init(RangerPolicy policy, RangerServiceDef serviceDef, RangerPolicyEngineOptions options); http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/3e59571c/agents-common/src/main/java/org/apache/ranger/plugin/policyevaluator/RangerPolicyItemEvaluator.java ---------------------------------------------------------------------- diff --git a/agents-common/src/main/java/org/apache/ranger/plugin/policyevaluator/RangerPolicyItemEvaluator.java b/agents-common/src/main/java/org/apache/ranger/plugin/policyevaluator/RangerPolicyItemEvaluator.java index 9ac2f93..3c4b926 100644 --- a/agents-common/src/main/java/org/apache/ranger/plugin/policyevaluator/RangerPolicyItemEvaluator.java +++ b/agents-common/src/main/java/org/apache/ranger/plugin/policyevaluator/RangerPolicyItemEvaluator.java @@ -26,11 +26,11 @@ import org.apache.ranger.plugin.model.RangerPolicy.RangerPolicyItem; import org.apache.ranger.plugin.policyengine.RangerAccessRequest; public interface RangerPolicyItemEvaluator extends Comparable<RangerPolicyItemEvaluator> { - public static final int POLICY_ITEM_TYPE_ALLOW = 0; - public static final int POLICY_ITEM_TYPE_DENY = 1; - public static final int POLICY_ITEM_TYPE_ALLOW_EXCEPTIONS = 2; - public static final int POLICY_ITEM_TYPE_DENY_EXCEPTIONS = 3; - public static final int POLICY_ITEM_TYPE_DATA_MASKING = 4; + int POLICY_ITEM_TYPE_ALLOW = 0; + int POLICY_ITEM_TYPE_DENY = 1; + int POLICY_ITEM_TYPE_ALLOW_EXCEPTIONS = 2; + int POLICY_ITEM_TYPE_DENY_EXCEPTIONS = 3; + int POLICY_ITEM_TYPE_DATA_MASKING = 4; void init(); http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/3e59571c/dev-support/ranger-pmd-ruleset.xml ---------------------------------------------------------------------- diff --git a/dev-support/ranger-pmd-ruleset.xml b/dev-support/ranger-pmd-ruleset.xml index 405c570..f82d831 100644 --- a/dev-support/ranger-pmd-ruleset.xml +++ b/dev-support/ranger-pmd-ruleset.xml @@ -37,7 +37,6 @@ <rule ref="rulesets/java/unusedcode.xml"> <exclude name="UnusedFormalParameter" /> <exclude name="UnusedLocalVariable" /> - <exclude name="UnusedModifier" /> <exclude name="UnusedPrivateField" /> <exclude name="UnusedPrivateMethod" /> </rule> http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/3e59571c/hbase-agent/src/main/java/org/apache/ranger/authorization/hbase/HbaseAuthUtils.java ---------------------------------------------------------------------- diff --git a/hbase-agent/src/main/java/org/apache/ranger/authorization/hbase/HbaseAuthUtils.java b/hbase-agent/src/main/java/org/apache/ranger/authorization/hbase/HbaseAuthUtils.java index 1d487e5..58f59bb 100644 --- a/hbase-agent/src/main/java/org/apache/ranger/authorization/hbase/HbaseAuthUtils.java +++ b/hbase-agent/src/main/java/org/apache/ranger/authorization/hbase/HbaseAuthUtils.java @@ -22,10 +22,10 @@ import org.apache.hadoop.hbase.coprocessor.RegionCoprocessorEnvironment; import org.apache.hadoop.hbase.security.access.Permission.Action; public interface HbaseAuthUtils { - public static final String ACCESS_TYPE_READ = "read"; - public static final String ACCESS_TYPE_WRITE = "write"; - public static final String ACCESS_TYPE_CREATE = "create"; - public static final String ACCESS_TYPE_ADMIN = "admin"; + String ACCESS_TYPE_READ = "read"; + String ACCESS_TYPE_WRITE = "write"; + String ACCESS_TYPE_CREATE = "create"; + String ACCESS_TYPE_ADMIN = "admin"; String getAccess(Action action); http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/3e59571c/hdfs-agent/src/main/java/org/apache/ranger/authorization/hadoop/HDFSAccessVerifier.java ---------------------------------------------------------------------- diff --git a/hdfs-agent/src/main/java/org/apache/ranger/authorization/hadoop/HDFSAccessVerifier.java b/hdfs-agent/src/main/java/org/apache/ranger/authorization/hadoop/HDFSAccessVerifier.java index 1a0cb0b..1bbae6b 100644 --- a/hdfs-agent/src/main/java/org/apache/ranger/authorization/hadoop/HDFSAccessVerifier.java +++ b/hdfs-agent/src/main/java/org/apache/ranger/authorization/hadoop/HDFSAccessVerifier.java @@ -21,7 +21,7 @@ package org.apache.ranger.authorization.hadoop; import java.util.Set; public interface HDFSAccessVerifier { - public class AccessContext { + class AccessContext { String agentId; int repositoryType; String sessionId; @@ -30,6 +30,6 @@ public interface HDFSAccessVerifier { String requestData; } - public boolean isAccessGranted(String aPathName, String aPathOwnerName, String access, String username, Set<String> groups); - public boolean isAuditLogEnabled(String aPathName) ; + boolean isAccessGranted(String aPathName, String aPathOwnerName, String access, String username, Set<String> groups); + boolean isAuditLogEnabled(String aPathName) ; } http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/3e59571c/jisql/src/main/java/org/apache/util/outputformatter/JisqlFormatter.java ---------------------------------------------------------------------- diff --git a/jisql/src/main/java/org/apache/util/outputformatter/JisqlFormatter.java b/jisql/src/main/java/org/apache/util/outputformatter/JisqlFormatter.java index 838225b..aac7b8e 100644 --- a/jisql/src/main/java/org/apache/util/outputformatter/JisqlFormatter.java +++ b/jisql/src/main/java/org/apache/util/outputformatter/JisqlFormatter.java @@ -37,7 +37,7 @@ public interface JisqlFormatter { * * @param parser - the OptionParser to use. */ - public void setSupportedOptions( OptionParser parser ); + void setSupportedOptions( OptionParser parser ); /** * Consumes any options that were specified on the command line. @@ -52,7 +52,7 @@ public interface JisqlFormatter { * for more information. * */ - public void consumeOptions( OptionSet options ) throws Exception; + void consumeOptions( OptionSet options ) throws Exception; /** * Called to output a usage message to the command line window. This @@ -61,7 +61,7 @@ public interface JisqlFormatter { * @param out where to put the usage message. * */ - public void usage( PrintStream out ); + void usage( PrintStream out ); /** @@ -72,7 +72,7 @@ public interface JisqlFormatter { * @param metaData the ResultSetMetaData for the output. * */ - public void formatHeader( PrintStream out, ResultSetMetaData metaData ) throws Exception; + void formatHeader( PrintStream out, ResultSetMetaData metaData ) throws Exception; /** * Called to output the data. @@ -82,7 +82,7 @@ public interface JisqlFormatter { * @param metaData the ResultSetMetaData for the row. * */ - public void formatData( PrintStream out, ResultSet resultSet, ResultSetMetaData metaData ) throws Exception; + void formatData( PrintStream out, ResultSet resultSet, ResultSetMetaData metaData ) throws Exception; /** * Outputs a footer for a query. This is called after all data has been @@ -92,5 +92,5 @@ public interface JisqlFormatter { * @param metaData the ResultSetMetaData for the output. * */ - public void formatFooter( PrintStream out, ResultSetMetaData metaData ) throws Exception; + void formatFooter( PrintStream out, ResultSetMetaData metaData ) throws Exception; } http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/3e59571c/kms/src/main/java/org/apache/hadoop/crypto/key/kms/server/KeyAuthorizationKeyProvider.java ---------------------------------------------------------------------- diff --git a/kms/src/main/java/org/apache/hadoop/crypto/key/kms/server/KeyAuthorizationKeyProvider.java b/kms/src/main/java/org/apache/hadoop/crypto/key/kms/server/KeyAuthorizationKeyProvider.java index ba4c043..fe2f175 100755 --- a/kms/src/main/java/org/apache/hadoop/crypto/key/kms/server/KeyAuthorizationKeyProvider.java +++ b/kms/src/main/java/org/apache/hadoop/crypto/key/kms/server/KeyAuthorizationKeyProvider.java @@ -61,7 +61,7 @@ public class KeyAuthorizationKeyProvider extends KeyProviderCryptoExtension { * Interface that needs to be implemented by a client of the * <code>KeyAuthorizationKeyProvider</code>. */ - public static interface KeyACLs { + public interface KeyACLs { /** * This is called by the KeyProvider to check if the given user is @@ -71,7 +71,7 @@ public class KeyAuthorizationKeyProvider extends KeyProviderCryptoExtension { * @param opType Operation Type * @return true if user has access to the aclName and opType else false */ - public boolean hasAccessToKey(String aclName, UserGroupInformation ugi, + boolean hasAccessToKey(String aclName, UserGroupInformation ugi, KeyOpType opType); /** @@ -80,15 +80,15 @@ public class KeyAuthorizationKeyProvider extends KeyProviderCryptoExtension { * @param opType Operation Type * @return true if AclName exists else false */ - public boolean isACLPresent(String aclName, KeyOpType opType); + boolean isACLPresent(String aclName, KeyOpType opType); - public void startReloader(); + void startReloader(); - public void stopReloader(); + void stopReloader(); - public boolean hasAccess(KMSACLsType.Type aclType, UserGroupInformation ugi, String clientIp); + boolean hasAccess(KMSACLsType.Type aclType, UserGroupInformation ugi, String clientIp); - public void assertAccess(KMSACLsType.Type aclType, UserGroupInformation ugi, + void assertAccess(KMSACLsType.Type aclType, UserGroupInformation ugi, KMSOp operation, String key, String clientIp) throws AccessControlException; } http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/3e59571c/ranger_solrj/src/main/java/org/apache/solr/client/solrj/request/JavaBinUpdateRequestCodec.java ---------------------------------------------------------------------- diff --git a/ranger_solrj/src/main/java/org/apache/solr/client/solrj/request/JavaBinUpdateRequestCodec.java b/ranger_solrj/src/main/java/org/apache/solr/client/solrj/request/JavaBinUpdateRequestCodec.java index 7bb64b4..ad4df43 100644 --- a/ranger_solrj/src/main/java/org/apache/solr/client/solrj/request/JavaBinUpdateRequestCodec.java +++ b/ranger_solrj/src/main/java/org/apache/solr/client/solrj/request/JavaBinUpdateRequestCodec.java @@ -245,7 +245,7 @@ public class JavaBinUpdateRequestCodec { return params.toNamedList(); } - public static interface StreamingUpdateHandler { - public void update(SolrInputDocument document, UpdateRequest req, Integer commitWithin, Boolean override); + public interface StreamingUpdateHandler { + void update(SolrInputDocument document, UpdateRequest req, Integer commitWithin, Boolean override); } } http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/3e59571c/ranger_solrj/src/main/java/org/apache/solr/common/cloud/BeforeReconnect.java ---------------------------------------------------------------------- diff --git a/ranger_solrj/src/main/java/org/apache/solr/common/cloud/BeforeReconnect.java b/ranger_solrj/src/main/java/org/apache/solr/common/cloud/BeforeReconnect.java index 44379a4..7777252 100644 --- a/ranger_solrj/src/main/java/org/apache/solr/common/cloud/BeforeReconnect.java +++ b/ranger_solrj/src/main/java/org/apache/solr/common/cloud/BeforeReconnect.java @@ -18,5 +18,5 @@ package org.apache.solr.common.cloud; */ public interface BeforeReconnect { - public void command(); + void command(); } http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/3e59571c/ranger_solrj/src/main/java/org/apache/solr/common/cloud/ClosableThread.java ---------------------------------------------------------------------- diff --git a/ranger_solrj/src/main/java/org/apache/solr/common/cloud/ClosableThread.java b/ranger_solrj/src/main/java/org/apache/solr/common/cloud/ClosableThread.java index 1a19cbd..09bc0c2 100644 --- a/ranger_solrj/src/main/java/org/apache/solr/common/cloud/ClosableThread.java +++ b/ranger_solrj/src/main/java/org/apache/solr/common/cloud/ClosableThread.java @@ -22,6 +22,6 @@ package org.apache.solr.common.cloud; */ @Deprecated public interface ClosableThread { - public void close(); - public boolean isClosed(); + void close(); + boolean isClosed(); } http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/3e59571c/ranger_solrj/src/main/java/org/apache/solr/common/cloud/OnReconnect.java ---------------------------------------------------------------------- diff --git a/ranger_solrj/src/main/java/org/apache/solr/common/cloud/OnReconnect.java b/ranger_solrj/src/main/java/org/apache/solr/common/cloud/OnReconnect.java index e447982..5c2672a 100644 --- a/ranger_solrj/src/main/java/org/apache/solr/common/cloud/OnReconnect.java +++ b/ranger_solrj/src/main/java/org/apache/solr/common/cloud/OnReconnect.java @@ -18,5 +18,5 @@ package org.apache.solr.common.cloud; */ public interface OnReconnect { - public void command(); + void command(); } http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/3e59571c/ranger_solrj/src/main/java/org/apache/solr/common/cloud/ZkCredentialsProvider.java ---------------------------------------------------------------------- diff --git a/ranger_solrj/src/main/java/org/apache/solr/common/cloud/ZkCredentialsProvider.java b/ranger_solrj/src/main/java/org/apache/solr/common/cloud/ZkCredentialsProvider.java index b4ab6d8..f385cda 100644 --- a/ranger_solrj/src/main/java/org/apache/solr/common/cloud/ZkCredentialsProvider.java +++ b/ranger_solrj/src/main/java/org/apache/solr/common/cloud/ZkCredentialsProvider.java @@ -21,7 +21,7 @@ import java.util.Collection; public interface ZkCredentialsProvider { - public class ZkCredentials { + class ZkCredentials { String scheme; byte[] auth; http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/3e59571c/ranger_solrj/src/main/java/org/apache/solr/common/params/AnalysisParams.java ---------------------------------------------------------------------- diff --git a/ranger_solrj/src/main/java/org/apache/solr/common/params/AnalysisParams.java b/ranger_solrj/src/main/java/org/apache/solr/common/params/AnalysisParams.java index 36c276f..39fce0c 100644 --- a/ranger_solrj/src/main/java/org/apache/solr/common/params/AnalysisParams.java +++ b/ranger_solrj/src/main/java/org/apache/solr/common/params/AnalysisParams.java @@ -28,17 +28,17 @@ public interface AnalysisParams { /** * The prefix for all parameters. */ - static final String PREFIX = "analysis"; + String PREFIX = "analysis"; /** * Holds the query to be analyzed. */ - static final String QUERY = PREFIX + ".query"; + String QUERY = PREFIX + ".query"; /** * Set to {@code true} to indicate that the index tokens that match query tokens should be marked as "mateched". */ - static final String SHOW_MATCH = PREFIX + ".showmatch"; + String SHOW_MATCH = PREFIX + ".showmatch"; //===================================== FieldAnalysisRequestHandler Params ========================================= @@ -46,15 +46,15 @@ public interface AnalysisParams { /** * Holds the value of the field which should be analyzed. */ - static final String FIELD_NAME = PREFIX + ".fieldname"; + String FIELD_NAME = PREFIX + ".fieldname"; /** * Holds a comma-separated list of field types that the analysis should be peformed for. */ - static final String FIELD_TYPE = PREFIX + ".fieldtype"; + String FIELD_TYPE = PREFIX + ".fieldtype"; /** * Hodls a comma-separated list of field named that the analysis should be performed for. */ - static final String FIELD_VALUE = PREFIX + ".fieldvalue"; + String FIELD_VALUE = PREFIX + ".fieldvalue"; } http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/3e59571c/ranger_solrj/src/main/java/org/apache/solr/common/params/CollectionParams.java ---------------------------------------------------------------------- diff --git a/ranger_solrj/src/main/java/org/apache/solr/common/params/CollectionParams.java b/ranger_solrj/src/main/java/org/apache/solr/common/params/CollectionParams.java index be8906e..e776971 100644 --- a/ranger_solrj/src/main/java/org/apache/solr/common/params/CollectionParams.java +++ b/ranger_solrj/src/main/java/org/apache/solr/common/params/CollectionParams.java @@ -22,11 +22,9 @@ import java.util.Locale; public interface CollectionParams { /** What action **/ - public final static String ACTION = "action"; - public final static String NAME = "name"; + String ACTION = "action"; + String NAME = "name"; - - public enum CollectionAction { CREATE, DELETE, http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/3e59571c/ranger_solrj/src/main/java/org/apache/solr/common/params/CommonParams.java ---------------------------------------------------------------------- diff --git a/ranger_solrj/src/main/java/org/apache/solr/common/params/CommonParams.java b/ranger_solrj/src/main/java/org/apache/solr/common/params/CommonParams.java index 699059a..858500f 100644 --- a/ranger_solrj/src/main/java/org/apache/solr/common/params/CommonParams.java +++ b/ranger_solrj/src/main/java/org/apache/solr/common/params/CommonParams.java @@ -31,138 +31,138 @@ public interface CommonParams { * distributed search to ensure consistent time values are used across * multiple sub-requests. */ - public static final String NOW = "NOW"; + String NOW = "NOW"; /** * Specifies the TimeZone used by the client for the purposes of * any DateMath rounding that may take place when executing the request */ - public static final String TZ = "TZ"; + String TZ = "TZ"; /** the Request Handler (formerly known as the Query Type) - which Request Handler should handle the request */ - public static final String QT ="qt"; + String QT ="qt"; /** the response writer type - the format of the response */ - public static final String WT ="wt"; + String WT ="wt"; /** query string */ - public static final String Q ="q"; + String Q ="q"; /** rank query */ - public static final String RQ ="rq"; + String RQ ="rq"; /** distrib string */ - public static final String DISTRIB = "distrib"; + String DISTRIB = "distrib"; /** sort order */ - public static final String SORT ="sort"; + String SORT ="sort"; /** Lucene query string(s) for filtering the results without affecting scoring */ - public static final String FQ ="fq"; + String FQ ="fq"; /** zero based offset of matching documents to retrieve */ - public static final String START ="start"; + String START ="start"; /** number of documents to return starting at "start" */ - public static final String ROWS ="rows"; + String ROWS ="rows"; // SOLR-4228 start /** handler value for SolrPing */ - public static final String PING_HANDLER = "/admin/ping"; + String PING_HANDLER = "/admin/ping"; /** "action" parameter for SolrPing */ - public static final String ACTION = "action"; + String ACTION = "action"; /** "disable" value for SolrPing action */ - public static final String DISABLE = "disable"; + String DISABLE = "disable"; /** "enable" value for SolrPing action */ - public static final String ENABLE = "enable"; + String ENABLE = "enable"; /** "ping" value for SolrPing action */ - public static final String PING = "ping"; + String PING = "ping"; // SOLR-4228 end /** stylesheet to apply to XML results */ - public static final String XSL ="xsl"; + String XSL ="xsl"; /** version parameter to check request-response compatibility */ - public static final String VERSION ="version"; + String VERSION ="version"; /** query and init param for field list */ - public static final String FL = "fl"; + String FL = "fl"; /** default query field */ - public static final String DF = "df"; + String DF = "df"; /** Transformer param -- used with XSLT */ - public static final String TR = "tr"; + String TR = "tr"; /** whether to include debug data for all components pieces, including doing explains*/ - public static final String DEBUG_QUERY = "debugQuery"; + String DEBUG_QUERY = "debugQuery"; /** * Whether to provide debug info for specific items. * * @see #DEBUG_QUERY */ - public static final String DEBUG = "debug"; + String DEBUG = "debug"; /** * {@link #DEBUG} value indicating an interest in debug output related to timing */ - public static final String TIMING = "timing"; + String TIMING = "timing"; /** * {@link #DEBUG} value indicating an interest in debug output related to the results (explains) */ - public static final String RESULTS = "results"; + String RESULTS = "results"; /** * {@link #DEBUG} value indicating an interest in debug output related to the Query (parsing, etc.) */ - public static final String QUERY = "query"; + String QUERY = "query"; /** * {@link #DEBUG} value indicating an interest in debug output related to the distributed tracking */ - public static final String TRACK = "track"; + String TRACK = "track"; /** * boolean indicating whether score explanations should structured (true), * or plain text (false) */ - public static final String EXPLAIN_STRUCT = "debug.explain.structured"; + String EXPLAIN_STRUCT = "debug.explain.structured"; /** another query to explain against */ - public static final String EXPLAIN_OTHER = "explainOther"; + String EXPLAIN_OTHER = "explainOther"; /** If the content stream should come from a URL (using URLConnection) */ - public static final String STREAM_URL = "stream.url"; + String STREAM_URL = "stream.url"; /** If the content stream should come from a File (using FileReader) */ - public static final String STREAM_FILE = "stream.file"; + String STREAM_FILE = "stream.file"; /** If the content stream should come directly from a field */ - public static final String STREAM_BODY = "stream.body"; + String STREAM_BODY = "stream.body"; /** * Explicitly set the content type for the input stream * If multiple streams are specified, the explicit contentType * will be used for all of them. */ - public static final String STREAM_CONTENTTYPE = "stream.contentType"; + String STREAM_CONTENTTYPE = "stream.contentType"; /** * Timeout value in milliseconds. If not set, or the value is >= 0, there is no timeout. */ - public static final String TIME_ALLOWED = "timeAllowed"; + String TIME_ALLOWED = "timeAllowed"; /** 'true' if the header should include the handler name */ - public static final String HEADER_ECHO_HANDLER = "echoHandler"; + String HEADER_ECHO_HANDLER = "echoHandler"; /** include the parameters in the header **/ - public static final String HEADER_ECHO_PARAMS = "echoParams"; + String HEADER_ECHO_PARAMS = "echoParams"; /** include header in the response */ - public static final String OMIT_HEADER = "omitHeader"; + String OMIT_HEADER = "omitHeader"; /** valid values for: <code>echoParams</code> */ public enum EchoParamStyle { @@ -188,41 +188,41 @@ public interface CommonParams { }; /** which parameters to log (if not supplied all parameters will be logged) **/ - public static final String LOG_PARAMS_LIST = "logParamsList"; - - public static final String EXCLUDE = "ex"; - public static final String TAG = "tag"; - public static final String TERMS = "terms"; - public static final String OUTPUT_KEY = "key"; - public static final String FIELD = "f"; - public static final String VALUE = "v"; - public static final String THREADS = "threads"; - public static final String TRUE = Boolean.TRUE.toString(); - public static final String FALSE = Boolean.FALSE.toString(); + String LOG_PARAMS_LIST = "logParamsList"; + + String EXCLUDE = "ex"; + String TAG = "tag"; + String TERMS = "terms"; + String OUTPUT_KEY = "key"; + String FIELD = "f"; + String VALUE = "v"; + String THREADS = "threads"; + String TRUE = Boolean.TRUE.toString(); + String FALSE = Boolean.FALSE.toString(); /** Used as a local parameter on queries. cache=false means don't check any query or filter caches. * cache=true is the default. */ - public static final String CACHE = "cache"; + String CACHE = "cache"; /** Used as a local param on filter queries in conjunction with cache=false. Filters are checked in order, from * smallest cost to largest. If cost>=100 and the query implements PostFilter, then that interface will be used to do post query filtering. */ - public static final String COST = "cost"; + String COST = "cost"; /** * Request ID parameter added to the request when using debug=track */ - public static final String REQUEST_ID = "rid"; + String REQUEST_ID = "rid"; /** * Request Purpose parameter added to each internal shard request when using debug=track */ - public static final String REQUEST_PURPOSE = "requestPurpose"; + String REQUEST_PURPOSE = "requestPurpose"; /** * When querying a node, prefer local node's cores for distributed queries. */ - public static final String PREFER_LOCAL_SHARDS = "preferLocalShards"; + String PREFER_LOCAL_SHARDS = "preferLocalShards"; } http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/3e59571c/ranger_solrj/src/main/java/org/apache/solr/common/params/CursorMarkParams.java ---------------------------------------------------------------------- diff --git a/ranger_solrj/src/main/java/org/apache/solr/common/params/CursorMarkParams.java b/ranger_solrj/src/main/java/org/apache/solr/common/params/CursorMarkParams.java index c20cfd9..8cd2a67 100644 --- a/ranger_solrj/src/main/java/org/apache/solr/common/params/CursorMarkParams.java +++ b/ranger_solrj/src/main/java/org/apache/solr/common/params/CursorMarkParams.java @@ -29,20 +29,20 @@ public interface CursorMarkParams { * first page of results, or a value returned by a previous search via the * {@link #CURSOR_MARK_NEXT} key. */ - public static final String CURSOR_MARK_PARAM = "cursorMark"; + String CURSOR_MARK_PARAM = "cursorMark"; /** * Key used in Solr response to inform the client what the "next" * {@link #CURSOR_MARK_PARAM} value should be to continue pagination */ - public static final String CURSOR_MARK_NEXT = "nextCursorMark"; + String CURSOR_MARK_NEXT = "nextCursorMark"; /** * Special value for {@link #CURSOR_MARK_PARAM} indicating that cursor functionality * should be used, and a new cursor value should be computed afte the last result, * but that currently the "first page" of results is being requested */ - public static final String CURSOR_MARK_START = "*"; + String CURSOR_MARK_START = "*"; } http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/3e59571c/ranger_solrj/src/main/java/org/apache/solr/common/params/DisMaxParams.java ---------------------------------------------------------------------- diff --git a/ranger_solrj/src/main/java/org/apache/solr/common/params/DisMaxParams.java b/ranger_solrj/src/main/java/org/apache/solr/common/params/DisMaxParams.java index c2c268e..9a0abe6 100644 --- a/ranger_solrj/src/main/java/org/apache/solr/common/params/DisMaxParams.java +++ b/ranger_solrj/src/main/java/org/apache/solr/common/params/DisMaxParams.java @@ -26,53 +26,53 @@ package org.apache.solr.common.params; public interface DisMaxParams { /** query and init param for tiebreaker value */ - public static String TIE = "tie"; + String TIE = "tie"; /** query and init param for query fields */ - public static String QF = "qf"; + String QF = "qf"; /** query and init param for phrase boost fields */ - public static String PF = "pf"; + String PF = "pf"; /** query and init param for bigram phrase boost fields */ - public static String PF2 = "pf2"; + String PF2 = "pf2"; /** query and init param for trigram phrase boost fields */ - public static String PF3 = "pf3"; + String PF3 = "pf3"; /** query and init param for MinShouldMatch specification */ - public static String MM = "mm"; + String MM = "mm"; /** * query and init param for Phrase Slop value in phrase * boost query (in pf fields) */ - public static String PS = "ps"; + String PS = "ps"; /** default phrase slop for bigram phrases (pf2) */ - public static String PS2 = "ps2"; + String PS2 = "ps2"; /** default phrase slop for bigram phrases (pf3) */ - public static String PS3 = "ps3"; + String PS3 = "ps3"; /** * query and init param for phrase Slop value in phrases * explicitly included in the user's query string ( in qf fields) */ - public static String QS = "qs"; + String QS = "qs"; /** query and init param for boosting query */ - public static String BQ = "bq"; + String BQ = "bq"; /** query and init param for boosting functions */ - public static String BF = "bf"; + String BF = "bf"; /** * Alternate query (expressed in Solr QuerySyntax) * to use if main query (q) is empty */ - public static String ALTQ = "q.alt"; + String ALTQ = "q.alt"; /** query and init param for field list */ - public static String GEN = "gen"; + String GEN = "gen"; } http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/3e59571c/ranger_solrj/src/main/java/org/apache/solr/common/params/EventParams.java ---------------------------------------------------------------------- diff --git a/ranger_solrj/src/main/java/org/apache/solr/common/params/EventParams.java b/ranger_solrj/src/main/java/org/apache/solr/common/params/EventParams.java index f5d43c0..b99b9cf 100644 --- a/ranger_solrj/src/main/java/org/apache/solr/common/params/EventParams.java +++ b/ranger_solrj/src/main/java/org/apache/solr/common/params/EventParams.java @@ -23,7 +23,7 @@ package org.apache.solr.common.params; **/ public interface EventParams { /** Event param for things like newSearcher, firstSearcher**/ - public static final String EVENT = "event"; - public static final String NEW_SEARCHER = "newSearcher"; - public static final String FIRST_SEARCHER = "firstSearcher"; + String EVENT = "event"; + String NEW_SEARCHER = "newSearcher"; + String FIRST_SEARCHER = "firstSearcher"; } http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/3e59571c/ranger_solrj/src/main/java/org/apache/solr/common/params/ExpandParams.java ---------------------------------------------------------------------- diff --git a/ranger_solrj/src/main/java/org/apache/solr/common/params/ExpandParams.java b/ranger_solrj/src/main/java/org/apache/solr/common/params/ExpandParams.java index a8f0cf7..5ea7d99 100644 --- a/ranger_solrj/src/main/java/org/apache/solr/common/params/ExpandParams.java +++ b/ranger_solrj/src/main/java/org/apache/solr/common/params/ExpandParams.java @@ -22,11 +22,11 @@ package org.apache.solr.common.params; */ public interface ExpandParams { - public static final String EXPAND = "expand"; - public static final String EXPAND_SORT = EXPAND + ".sort"; - public static final String EXPAND_ROWS = EXPAND + ".rows"; - public static final String EXPAND_FIELD = EXPAND + ".field"; - public static final String EXPAND_Q = EXPAND + ".q"; - public static final String EXPAND_FQ = EXPAND + ".fq"; + String EXPAND = "expand"; + String EXPAND_SORT = EXPAND + ".sort"; + String EXPAND_ROWS = EXPAND + ".rows"; + String EXPAND_FIELD = EXPAND + ".field"; + String EXPAND_Q = EXPAND + ".q"; + String EXPAND_FQ = EXPAND + ".fq"; } http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/3e59571c/ranger_solrj/src/main/java/org/apache/solr/common/params/FacetParams.java ---------------------------------------------------------------------- diff --git a/ranger_solrj/src/main/java/org/apache/solr/common/params/FacetParams.java b/ranger_solrj/src/main/java/org/apache/solr/common/params/FacetParams.java index 2dae65f..42bd1fc 100644 --- a/ranger_solrj/src/main/java/org/apache/solr/common/params/FacetParams.java +++ b/ranger_solrj/src/main/java/org/apache/solr/common/params/FacetParams.java @@ -30,84 +30,84 @@ public interface FacetParams { /** * Should facet counts be calculated? */ - public static final String FACET = "facet"; + String FACET = "facet"; /** * Numeric option indicating the maximum number of threads to be used * in counting facet field vales */ - public static final String FACET_THREADS = FACET + ".threads"; + String FACET_THREADS = FACET + ".threads"; /** What method should be used to do the faceting */ - public static final String FACET_METHOD = FACET + ".method"; + String FACET_METHOD = FACET + ".method"; /** Value for FACET_METHOD param to indicate that Solr should enumerate over terms * in a field to calculate the facet counts. */ - public static final String FACET_METHOD_enum = "enum"; + String FACET_METHOD_enum = "enum"; /** Value for FACET_METHOD param to indicate that Solr should enumerate over documents * and count up terms by consulting an uninverted representation of the field values * (such as the FieldCache used for sorting). */ - public static final String FACET_METHOD_fc = "fc"; + String FACET_METHOD_fc = "fc"; /** Value for FACET_METHOD param, like FACET_METHOD_fc but counts per-segment. */ - public static final String FACET_METHOD_fcs = "fcs"; + String FACET_METHOD_fcs = "fcs"; /** * Any lucene formated queries the user would like to use for * Facet Constraint Counts (multi-value) */ - public static final String FACET_QUERY = FACET + ".query"; + String FACET_QUERY = FACET + ".query"; /** * Any field whose terms the user wants to enumerate over for * Facet Constraint Counts (multi-value) */ - public static final String FACET_FIELD = FACET + ".field"; + String FACET_FIELD = FACET + ".field"; /** * The offset into the list of facets. * Can be overridden on a per field basis. */ - public static final String FACET_OFFSET = FACET + ".offset"; + String FACET_OFFSET = FACET + ".offset"; /** * Numeric option indicating the maximum number of facet field counts * be included in the response for each field - in descending order of count. * Can be overridden on a per field basis. */ - public static final String FACET_LIMIT = FACET + ".limit"; + String FACET_LIMIT = FACET + ".limit"; /** * Numeric option indicating the minimum number of hits before a facet should * be included in the response. Can be overridden on a per field basis. */ - public static final String FACET_MINCOUNT = FACET + ".mincount"; + String FACET_MINCOUNT = FACET + ".mincount"; /** * Boolean option indicating whether facet field counts of "0" should * be included in the response. Can be overridden on a per field basis. */ - public static final String FACET_ZEROS = FACET + ".zeros"; + String FACET_ZEROS = FACET + ".zeros"; /** * Boolean option indicating whether the response should include a * facet field count for all records which have no value for the * facet field. Can be overridden on a per field basis. */ - public static final String FACET_MISSING = FACET + ".missing"; + String FACET_MISSING = FACET + ".missing"; - static final String FACET_OVERREQUEST = FACET + ".overrequest"; + String FACET_OVERREQUEST = FACET + ".overrequest"; /** * The percentage to over-request by when performing initial distributed requests. * * default value is 1.5 */ - public static final String FACET_OVERREQUEST_RATIO = FACET_OVERREQUEST + ".ratio"; + String FACET_OVERREQUEST_RATIO = FACET_OVERREQUEST + ".ratio"; /** * An additional amount to over-request by when performing initial distributed requests. This @@ -115,7 +115,7 @@ public interface FacetParams { * * default value is 10 */ - public static final String FACET_OVERREQUEST_COUNT = FACET_OVERREQUEST + ".count"; + String FACET_OVERREQUEST_COUNT = FACET_OVERREQUEST + ".count"; /** @@ -123,58 +123,58 @@ public interface FacetParams { * * example: author,type (for types by author / types within author) */ - public static final String FACET_PIVOT = FACET + ".pivot"; + String FACET_PIVOT = FACET + ".pivot"; /** * Minimum number of docs that need to match to be included in the sublist * * default value is 1 */ - public static final String FACET_PIVOT_MINCOUNT = FACET_PIVOT + ".mincount"; + String FACET_PIVOT_MINCOUNT = FACET_PIVOT + ".mincount"; /** * String option: "count" causes facets to be sorted * by the count, "index" results in index order. */ - public static final String FACET_SORT = FACET + ".sort"; + String FACET_SORT = FACET + ".sort"; - public static final String FACET_SORT_COUNT = "count"; - public static final String FACET_SORT_COUNT_LEGACY = "true"; - public static final String FACET_SORT_INDEX = "index"; - public static final String FACET_SORT_INDEX_LEGACY = "false"; + String FACET_SORT_COUNT = "count"; + String FACET_SORT_COUNT_LEGACY = "true"; + String FACET_SORT_INDEX = "index"; + String FACET_SORT_INDEX_LEGACY = "false"; /** * Only return constraints of a facet field with the given prefix. */ - public static final String FACET_PREFIX = FACET + ".prefix"; + String FACET_PREFIX = FACET + ".prefix"; /** * When faceting by enumerating the terms in a field, * only use the filterCache for terms with a df >= to this parameter. */ - public static final String FACET_ENUM_CACHE_MINDF = FACET + ".enum.cache.minDf"; + String FACET_ENUM_CACHE_MINDF = FACET + ".enum.cache.minDf"; /** * Any field whose terms the user wants to enumerate over for * Facet Contraint Counts (multi-value) */ - public static final String FACET_DATE = FACET + ".date"; + String FACET_DATE = FACET + ".date"; /** * Date string indicating the starting point for a date facet range. * Can be overriden on a per field basis. */ - public static final String FACET_DATE_START = FACET_DATE + ".start"; + String FACET_DATE_START = FACET_DATE + ".start"; /** * Date string indicating the endinging point for a date facet range. * Can be overriden on a per field basis. */ - public static final String FACET_DATE_END = FACET_DATE + ".end"; + String FACET_DATE_END = FACET_DATE + ".end"; /** * Date Math string indicating the interval of sub-ranges for a date * facet range. * Can be overriden on a per field basis. */ - public static final String FACET_DATE_GAP = FACET_DATE + ".gap"; + String FACET_DATE_GAP = FACET_DATE + ".gap"; /** * Boolean indicating how counts should be computed if the range * between 'start' and 'end' is not evenly divisible by 'gap'. If @@ -188,14 +188,14 @@ public interface FacetParams { * The default is false. * Can be overriden on a per field basis. */ - public static final String FACET_DATE_HARD_END = FACET_DATE + ".hardend"; + String FACET_DATE_HARD_END = FACET_DATE + ".hardend"; /** * String indicating what "other" ranges should be computed for a * date facet range (multi-value). * Can be overriden on a per field basis. * @see FacetRangeOther */ - public static final String FACET_DATE_OTHER = FACET_DATE + ".other"; + String FACET_DATE_OTHER = FACET_DATE + ".other"; /** * <p> @@ -212,29 +212,29 @@ public interface FacetParams { * @see FacetRangeInclude * @see #FACET_RANGE_INCLUDE */ - public static final String FACET_DATE_INCLUDE = FACET_DATE + ".include"; + String FACET_DATE_INCLUDE = FACET_DATE + ".include"; /** * Any numerical field whose terms the user wants to enumerate over * Facet Contraint Counts for selected ranges. */ - public static final String FACET_RANGE = FACET + ".range"; + String FACET_RANGE = FACET + ".range"; /** * Number indicating the starting point for a numerical range facet. * Can be overriden on a per field basis. */ - public static final String FACET_RANGE_START = FACET_RANGE + ".start"; + String FACET_RANGE_START = FACET_RANGE + ".start"; /** * Number indicating the ending point for a numerical range facet. * Can be overriden on a per field basis. */ - public static final String FACET_RANGE_END = FACET_RANGE + ".end"; + String FACET_RANGE_END = FACET_RANGE + ".end"; /** * Number indicating the interval of sub-ranges for a numerical * facet range. * Can be overriden on a per field basis. */ - public static final String FACET_RANGE_GAP = FACET_RANGE + ".gap"; + String FACET_RANGE_GAP = FACET_RANGE + ".gap"; /** * Boolean indicating how counts should be computed if the range * between 'start' and 'end' is not evenly divisible by 'gap'. If @@ -248,13 +248,13 @@ public interface FacetParams { * The default is false. * Can be overriden on a per field basis. */ - public static final String FACET_RANGE_HARD_END = FACET_RANGE + ".hardend"; + String FACET_RANGE_HARD_END = FACET_RANGE + ".hardend"; /** * String indicating what "other" ranges should be computed for a * numerical range facet (multi-value). * Can be overriden on a per field basis. */ - public static final String FACET_RANGE_OTHER = FACET_RANGE + ".other"; + String FACET_RANGE_OTHER = FACET_RANGE + ".other"; /** * <p> @@ -270,40 +270,40 @@ public interface FacetParams { * </p> * @see FacetRangeInclude */ - public static final String FACET_RANGE_INCLUDE = FACET_RANGE + ".include"; + String FACET_RANGE_INCLUDE = FACET_RANGE + ".include"; /** * Any field whose values the user wants to enumerate as explicit intervals of terms. */ - public static final String FACET_INTERVAL = FACET + ".interval"; + String FACET_INTERVAL = FACET + ".interval"; /** * Set of terms for a single interval to facet on. */ - public static final String FACET_INTERVAL_SET = FACET_INTERVAL + ".set"; + String FACET_INTERVAL_SET = FACET_INTERVAL + ".set"; /** A spatial RPT field to generate a 2D "heatmap" (grid of facet counts) on. Just like the other faceting types, * this may include a 'key' or local-params to facet multiple times. All parameters with this suffix can be * overridden on a per-field basis. */ - public static final String FACET_HEATMAP = "facet.heatmap"; + String FACET_HEATMAP = "facet.heatmap"; /** The format of the heatmap: either png or ints2D (default). */ - public static final String FACET_HEATMAP_FORMAT = FACET_HEATMAP + ".format"; + String FACET_HEATMAP_FORMAT = FACET_HEATMAP + ".format"; /** The region the heatmap should minimally enclose. It defaults to the world if not set. The format can either be * a minimum to maximum point range format: <pre>["-150 10" TO "-100 30"]</pre> (the first is bottom-left and second * is bottom-right, both of which are parsed as points are parsed). OR, any WKT can be provided and it's bounding * box will be taken. */ - public static final String FACET_HEATMAP_GEOM = FACET_HEATMAP + ".geom"; + String FACET_HEATMAP_GEOM = FACET_HEATMAP + ".geom"; /** Specify the heatmap grid level explicitly, instead of deriving it via distErr or distErrPct. */ - public static final String FACET_HEATMAP_LEVEL = FACET_HEATMAP + ".gridLevel"; + String FACET_HEATMAP_LEVEL = FACET_HEATMAP + ".gridLevel"; /** Used to determine the heatmap grid level to compute, defaulting to 0.15. It has the same interpretation of * distErrPct when searching on RPT, but relative to the shape in 'bbox'. It's a fraction (not a %) of the radius of * the shape that grid squares must fit into without exceeding. > 0 and <= 0.5. * Mutually exclusive with distErr & gridLevel. */ - public static final String FACET_HEATMAP_DIST_ERR_PCT = FACET_HEATMAP + ".distErrPct"; + String FACET_HEATMAP_DIST_ERR_PCT = FACET_HEATMAP + ".distErrPct"; /** Used to determine the heatmap grid level to compute (optional). It has the same interpretation of maxDistErr or * distErr with RPT. It's an absolute distance (in units of what's specified on the field type) that a grid square @@ -311,11 +311,11 @@ public interface FacetParams { * size without knowledge of what particular grid levels translate to. This can in turn be used with * knowledge of the size of 'bbox' to get a target minimum number of grid cells. * Mutually exclusive with distErrPct & gridLevel. */ - public static final String FACET_HEATMAP_DIST_ERR = FACET_HEATMAP + ".distErr"; + String FACET_HEATMAP_DIST_ERR = FACET_HEATMAP + ".distErr"; /** The maximum number of cells (grid squares) the client is willing to handle. If this limit would be exceeded, we * throw an error instead. Defaults to 100k. */ - public static final String FACET_HEATMAP_MAX_CELLS = FACET_HEATMAP + ".maxCells"; + String FACET_HEATMAP_MAX_CELLS = FACET_HEATMAP + ".maxCells"; /** * An enumeration of the legal values for {@link #FACET_RANGE_OTHER} and {@link #FACET_DATE_OTHER} ... http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/3e59571c/ranger_solrj/src/main/java/org/apache/solr/common/params/GroupParams.java ---------------------------------------------------------------------- diff --git a/ranger_solrj/src/main/java/org/apache/solr/common/params/GroupParams.java b/ranger_solrj/src/main/java/org/apache/solr/common/params/GroupParams.java index ca8e2c4..36f11cf 100644 --- a/ranger_solrj/src/main/java/org/apache/solr/common/params/GroupParams.java +++ b/ranger_solrj/src/main/java/org/apache/solr/common/params/GroupParams.java @@ -21,51 +21,51 @@ package org.apache.solr.common.params; * Group parameters */ public interface GroupParams { - public static final String GROUP = "group"; + String GROUP = "group"; - public static final String GROUP_QUERY = GROUP + ".query"; - public static final String GROUP_FIELD = GROUP + ".field"; - public static final String GROUP_FUNC = GROUP + ".func"; - public static final String GROUP_SORT = GROUP + ".sort"; + String GROUP_QUERY = GROUP + ".query"; + String GROUP_FIELD = GROUP + ".field"; + String GROUP_FUNC = GROUP + ".func"; + String GROUP_SORT = GROUP + ".sort"; /** the limit for the number of documents in each group */ - public static final String GROUP_LIMIT = GROUP + ".limit"; + String GROUP_LIMIT = GROUP + ".limit"; /** the offset for the doclist of each group */ - public static final String GROUP_OFFSET = GROUP + ".offset"; + String GROUP_OFFSET = GROUP + ".offset"; /** treat the first group result as the main result. true/false */ - public static final String GROUP_MAIN = GROUP + ".main"; + String GROUP_MAIN = GROUP + ".main"; /** treat the first group result as the main result. true/false */ - public static final String GROUP_FORMAT = GROUP + ".format"; + String GROUP_FORMAT = GROUP + ".format"; /** * Whether to cache the first pass search (doc ids and score) for the second pass search. * Also defines the maximum size of the group cache relative to maxdoc in a percentage. * Values can be a positive integer, from 0 till 100. A value of 0 will disable the group cache. * The default is 0.*/ - public static final String GROUP_CACHE_PERCENTAGE = GROUP + ".cache.percent"; + String GROUP_CACHE_PERCENTAGE = GROUP + ".cache.percent"; // Note: Since you can supply multiple fields to group on, but only have a facets for the whole result. It only makes // sense to me to support these parameters for the first group. /** Whether the docSet (for example for faceting) should be based on plain documents (a.k.a UNGROUPED) or on the groups (a.k.a GROUPED). * The docSet will only the most relevant documents per group. It is if you query for everything with group.limit=1 */ - public static final String GROUP_TRUNCATE = GROUP + ".truncate"; + String GROUP_TRUNCATE = GROUP + ".truncate"; /** Whether the group count should be included in the response. */ - public static final String GROUP_TOTAL_COUNT = GROUP + ".ngroups"; + String GROUP_TOTAL_COUNT = GROUP + ".ngroups"; /** Whether to compute grouped facets based on the first specified group. */ - public static final String GROUP_FACET = GROUP + ".facet"; + String GROUP_FACET = GROUP + ".facet"; /** Retrieve the top search groups (top group values) from the shards being queried. */ - public static final String GROUP_DISTRIBUTED_FIRST = GROUP + ".distributed.first"; + String GROUP_DISTRIBUTED_FIRST = GROUP + ".distributed.first"; /** Retrieve the top groups from the shards being queries based on the specified search groups in * the {@link #GROUP_DISTRIBUTED_TOPGROUPS_PREFIX} parameters. */ - public static final String GROUP_DISTRIBUTED_SECOND = GROUP + ".distributed.second"; + String GROUP_DISTRIBUTED_SECOND = GROUP + ".distributed.second"; - public static final String GROUP_DISTRIBUTED_TOPGROUPS_PREFIX = GROUP + ".topgroups."; + String GROUP_DISTRIBUTED_TOPGROUPS_PREFIX = GROUP + ".topgroups."; } http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/3e59571c/ranger_solrj/src/main/java/org/apache/solr/common/params/HighlightParams.java ---------------------------------------------------------------------- diff --git a/ranger_solrj/src/main/java/org/apache/solr/common/params/HighlightParams.java b/ranger_solrj/src/main/java/org/apache/solr/common/params/HighlightParams.java index ceccd74..66c2542 100644 --- a/ranger_solrj/src/main/java/org/apache/solr/common/params/HighlightParams.java +++ b/ranger_solrj/src/main/java/org/apache/solr/common/params/HighlightParams.java @@ -22,61 +22,61 @@ package org.apache.solr.common.params; * @since solr 1.3 */ public interface HighlightParams { - public static final String HIGHLIGHT = "hl"; - public static final String Q = HIGHLIGHT+".q"; - public static final String QPARSER = HIGHLIGHT+".qparser"; - public static final String FIELDS = HIGHLIGHT+".fl"; - public static final String SNIPPETS = HIGHLIGHT+".snippets"; - public static final String FRAGSIZE = HIGHLIGHT+".fragsize"; - public static final String INCREMENT = HIGHLIGHT+".increment"; - public static final String MAX_CHARS = HIGHLIGHT+".maxAnalyzedChars"; - public static final String FORMATTER = HIGHLIGHT+".formatter"; - public static final String ENCODER = HIGHLIGHT+".encoder"; - public static final String FRAGMENTER = HIGHLIGHT+".fragmenter"; - public static final String PRESERVE_MULTI = HIGHLIGHT+".preserveMulti"; - public static final String FRAG_LIST_BUILDER = HIGHLIGHT+".fragListBuilder"; - public static final String FRAGMENTS_BUILDER = HIGHLIGHT+".fragmentsBuilder"; - public static final String BOUNDARY_SCANNER = HIGHLIGHT+".boundaryScanner"; - public static final String BS_MAX_SCAN = HIGHLIGHT+".bs.maxScan"; - public static final String BS_CHARS = HIGHLIGHT+".bs.chars"; - public static final String BS_TYPE = HIGHLIGHT+".bs.type"; - public static final String BS_LANGUAGE = HIGHLIGHT+".bs.language"; - public static final String BS_COUNTRY = HIGHLIGHT+".bs.country"; - public static final String BS_VARIANT = HIGHLIGHT+".bs.variant"; - public static final String FIELD_MATCH = HIGHLIGHT+".requireFieldMatch"; - public static final String DEFAULT_SUMMARY = HIGHLIGHT + ".defaultSummary"; - public static final String ALTERNATE_FIELD = HIGHLIGHT+".alternateField"; - public static final String ALTERNATE_FIELD_LENGTH = HIGHLIGHT+".maxAlternateFieldLength"; - public static final String MAX_MULTIVALUED_TO_EXAMINE = HIGHLIGHT + ".maxMultiValuedToExamine"; - public static final String MAX_MULTIVALUED_TO_MATCH = HIGHLIGHT + ".maxMultiValuedToMatch"; + String HIGHLIGHT = "hl"; + String Q = HIGHLIGHT+".q"; + String QPARSER = HIGHLIGHT+".qparser"; + String FIELDS = HIGHLIGHT+".fl"; + String SNIPPETS = HIGHLIGHT+".snippets"; + String FRAGSIZE = HIGHLIGHT+".fragsize"; + String INCREMENT = HIGHLIGHT+".increment"; + String MAX_CHARS = HIGHLIGHT+".maxAnalyzedChars"; + String FORMATTER = HIGHLIGHT+".formatter"; + String ENCODER = HIGHLIGHT+".encoder"; + String FRAGMENTER = HIGHLIGHT+".fragmenter"; + String PRESERVE_MULTI = HIGHLIGHT+".preserveMulti"; + String FRAG_LIST_BUILDER = HIGHLIGHT+".fragListBuilder"; + String FRAGMENTS_BUILDER = HIGHLIGHT+".fragmentsBuilder"; + String BOUNDARY_SCANNER = HIGHLIGHT+".boundaryScanner"; + String BS_MAX_SCAN = HIGHLIGHT+".bs.maxScan"; + String BS_CHARS = HIGHLIGHT+".bs.chars"; + String BS_TYPE = HIGHLIGHT+".bs.type"; + String BS_LANGUAGE = HIGHLIGHT+".bs.language"; + String BS_COUNTRY = HIGHLIGHT+".bs.country"; + String BS_VARIANT = HIGHLIGHT+".bs.variant"; + String FIELD_MATCH = HIGHLIGHT+".requireFieldMatch"; + String DEFAULT_SUMMARY = HIGHLIGHT + ".defaultSummary"; + String ALTERNATE_FIELD = HIGHLIGHT+".alternateField"; + String ALTERNATE_FIELD_LENGTH = HIGHLIGHT+".maxAlternateFieldLength"; + String MAX_MULTIVALUED_TO_EXAMINE = HIGHLIGHT + ".maxMultiValuedToExamine"; + String MAX_MULTIVALUED_TO_MATCH = HIGHLIGHT + ".maxMultiValuedToMatch"; - public static final String USE_PHRASE_HIGHLIGHTER = HIGHLIGHT+".usePhraseHighlighter"; - public static final String HIGHLIGHT_MULTI_TERM = HIGHLIGHT+".highlightMultiTerm"; - public static final String PAYLOADS = HIGHLIGHT+".payloads"; + String USE_PHRASE_HIGHLIGHTER = HIGHLIGHT+".usePhraseHighlighter"; + String HIGHLIGHT_MULTI_TERM = HIGHLIGHT+".highlightMultiTerm"; + String PAYLOADS = HIGHLIGHT+".payloads"; - public static final String MERGE_CONTIGUOUS_FRAGMENTS = HIGHLIGHT + ".mergeContiguous"; + String MERGE_CONTIGUOUS_FRAGMENTS = HIGHLIGHT + ".mergeContiguous"; - public static final String USE_FVH = HIGHLIGHT + ".useFastVectorHighlighter"; - public static final String TAG_PRE = HIGHLIGHT + ".tag.pre"; - public static final String TAG_POST = HIGHLIGHT + ".tag.post"; - public static final String TAG_ELLIPSIS = HIGHLIGHT + ".tag.ellipsis"; - public static final String PHRASE_LIMIT = HIGHLIGHT + ".phraseLimit"; - public static final String MULTI_VALUED_SEPARATOR = HIGHLIGHT + ".multiValuedSeparatorChar"; + String USE_FVH = HIGHLIGHT + ".useFastVectorHighlighter"; + String TAG_PRE = HIGHLIGHT + ".tag.pre"; + String TAG_POST = HIGHLIGHT + ".tag.post"; + String TAG_ELLIPSIS = HIGHLIGHT + ".tag.ellipsis"; + String PHRASE_LIMIT = HIGHLIGHT + ".phraseLimit"; + String MULTI_VALUED_SEPARATOR = HIGHLIGHT + ".multiValuedSeparatorChar"; // Formatter - public static final String SIMPLE = "simple"; - public static final String SIMPLE_PRE = HIGHLIGHT+"."+SIMPLE+".pre"; - public static final String SIMPLE_POST = HIGHLIGHT+"."+SIMPLE+".post"; + String SIMPLE = "simple"; + String SIMPLE_PRE = HIGHLIGHT+"."+SIMPLE+".pre"; + String SIMPLE_POST = HIGHLIGHT+"."+SIMPLE+".post"; // Regex fragmenter - public static final String REGEX = "regex"; - public static final String SLOP = HIGHLIGHT+"."+REGEX+".slop"; - public static final String PATTERN = HIGHLIGHT+"."+REGEX+".pattern"; - public static final String MAX_RE_CHARS = HIGHLIGHT+"."+REGEX+".maxAnalyzedChars"; + String REGEX = "regex"; + String SLOP = HIGHLIGHT+"."+REGEX+".slop"; + String PATTERN = HIGHLIGHT+"."+REGEX+".pattern"; + String MAX_RE_CHARS = HIGHLIGHT+"."+REGEX+".maxAnalyzedChars"; // Scoring parameters - public static final String SCORE = "score"; - public static final String SCORE_K1 = HIGHLIGHT +"."+SCORE+".k1"; - public static final String SCORE_B = HIGHLIGHT +"."+SCORE+".b"; - public static final String SCORE_PIVOT = HIGHLIGHT +"."+SCORE+".pivot"; + String SCORE = "score"; + String SCORE_K1 = HIGHLIGHT +"."+SCORE+".k1"; + String SCORE_B = HIGHLIGHT +"."+SCORE+".b"; + String SCORE_PIVOT = HIGHLIGHT +"."+SCORE+".pivot"; } http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/3e59571c/ranger_solrj/src/main/java/org/apache/solr/common/params/MoreLikeThisParams.java ---------------------------------------------------------------------- diff --git a/ranger_solrj/src/main/java/org/apache/solr/common/params/MoreLikeThisParams.java b/ranger_solrj/src/main/java/org/apache/solr/common/params/MoreLikeThisParams.java index 0d808c2..44a950f 100644 --- a/ranger_solrj/src/main/java/org/apache/solr/common/params/MoreLikeThisParams.java +++ b/ranger_solrj/src/main/java/org/apache/solr/common/params/MoreLikeThisParams.java @@ -25,32 +25,32 @@ import java.util.Locale; public interface MoreLikeThisParams { // enable more like this -- this only applies to 'StandardRequestHandler' maybe DismaxRequestHandler - public final static String MLT = "mlt"; + String MLT = "mlt"; - public final static String PREFIX = "mlt."; + String PREFIX = "mlt."; - public final static String SIMILARITY_FIELDS = PREFIX + "fl"; - public final static String MIN_TERM_FREQ = PREFIX + "mintf"; - public final static String MAX_DOC_FREQ = PREFIX + "maxdf"; - public final static String MIN_DOC_FREQ = PREFIX + "mindf"; - public final static String MIN_WORD_LEN = PREFIX + "minwl"; - public final static String MAX_WORD_LEN = PREFIX + "maxwl"; - public final static String MAX_QUERY_TERMS = PREFIX + "maxqt"; - public final static String MAX_NUM_TOKENS_PARSED = PREFIX + "maxntp"; - public final static String BOOST = PREFIX + "boost"; // boost or not? - public final static String QF = PREFIX + "qf"; //boosting applied to mlt fields + String SIMILARITY_FIELDS = PREFIX + "fl"; + String MIN_TERM_FREQ = PREFIX + "mintf"; + String MAX_DOC_FREQ = PREFIX + "maxdf"; + String MIN_DOC_FREQ = PREFIX + "mindf"; + String MIN_WORD_LEN = PREFIX + "minwl"; + String MAX_WORD_LEN = PREFIX + "maxwl"; + String MAX_QUERY_TERMS = PREFIX + "maxqt"; + String MAX_NUM_TOKENS_PARSED = PREFIX + "maxntp"; + String BOOST = PREFIX + "boost"; // boost or not? + String QF = PREFIX + "qf"; //boosting applied to mlt fields // the /mlt request handler uses 'rows' - public final static String DOC_COUNT = PREFIX + "count"; + String DOC_COUNT = PREFIX + "count"; // Do you want to include the original document in the results or not - public final static String MATCH_INCLUDE = PREFIX + "match.include"; + String MATCH_INCLUDE = PREFIX + "match.include"; // If multiple docs are matched in the query, what offset do you want? - public final static String MATCH_OFFSET = PREFIX + "match.offset"; + String MATCH_OFFSET = PREFIX + "match.offset"; // Do you want to include the original document in the results or not - public final static String INTERESTING_TERMS = PREFIX + "interestingTerms"; // false,details,(list or true) + String INTERESTING_TERMS = PREFIX + "interestingTerms"; // false,details,(list or true) public enum TermStyle { NONE, http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/3e59571c/ranger_solrj/src/main/java/org/apache/solr/common/params/ShardParams.java ---------------------------------------------------------------------- diff --git a/ranger_solrj/src/main/java/org/apache/solr/common/params/ShardParams.java b/ranger_solrj/src/main/java/org/apache/solr/common/params/ShardParams.java index 46a9fc0..70a39fd 100644 --- a/ranger_solrj/src/main/java/org/apache/solr/common/params/ShardParams.java +++ b/ranger_solrj/src/main/java/org/apache/solr/common/params/ShardParams.java @@ -22,35 +22,35 @@ package org.apache.solr.common.params; */ public interface ShardParams { /** the shards to use (distributed configuration) */ - public static final String SHARDS = "shards"; + String SHARDS = "shards"; /** per-shard start and rows */ - public static final String SHARDS_ROWS = "shards.rows"; - public static final String SHARDS_START = "shards.start"; + String SHARDS_ROWS = "shards.rows"; + String SHARDS_START = "shards.start"; /** IDs of the shard documents */ - public static final String IDS = "ids"; + String IDS = "ids"; /** whether the request goes to a shard */ - public static final String IS_SHARD = "isShard"; + String IS_SHARD = "isShard"; /** The requested URL for this shard */ - public static final String SHARD_URL = "shard.url"; + String SHARD_URL = "shard.url"; /** The Request Handler for shard requests */ - public static final String SHARDS_QT = "shards.qt"; + String SHARDS_QT = "shards.qt"; /** Request detailed match info for each shard (true/false) */ - public static final String SHARDS_INFO = "shards.info"; + String SHARDS_INFO = "shards.info"; /** Should things fail if there is an error? (true/false) */ - public static final String SHARDS_TOLERANT = "shards.tolerant"; + String SHARDS_TOLERANT = "shards.tolerant"; /** query purpose for shard requests */ - public static final String SHARDS_PURPOSE = "shards.purpose"; + String SHARDS_PURPOSE = "shards.purpose"; - public static final String _ROUTE_ = "_route_"; + String _ROUTE_ = "_route_"; /** Force a single-pass distributed query? (true/false) */ - public static final String DISTRIB_SINGLE_PASS = "distrib.singlePass"; + String DISTRIB_SINGLE_PASS = "distrib.singlePass"; } http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/3e59571c/ranger_solrj/src/main/java/org/apache/solr/common/params/SimpleParams.java ---------------------------------------------------------------------- diff --git a/ranger_solrj/src/main/java/org/apache/solr/common/params/SimpleParams.java b/ranger_solrj/src/main/java/org/apache/solr/common/params/SimpleParams.java index e770402..55f8521 100644 --- a/ranger_solrj/src/main/java/org/apache/solr/common/params/SimpleParams.java +++ b/ranger_solrj/src/main/java/org/apache/solr/common/params/SimpleParams.java @@ -22,29 +22,29 @@ package org.apache.solr.common.params; */ public interface SimpleParams { /** Query fields and boosts. */ - public static String QF = "qf"; + String QF = "qf"; /** Override the currently enabled/disabled query operators. */ - public static String QO = "q.operators"; + String QO = "q.operators"; /** Enables {@code AND} operator (+) */ - public static final String AND_OPERATOR = "AND"; + String AND_OPERATOR = "AND"; /** Enables {@code NOT} operator (-) */ - public static final String NOT_OPERATOR = "NOT"; + String NOT_OPERATOR = "NOT"; /** Enables {@code OR} operator (|) */ - public static final String OR_OPERATOR = "OR"; + String OR_OPERATOR = "OR"; /** Enables {@code PREFIX} operator (*) */ - public static final String PREFIX_OPERATOR = "PREFIX"; + String PREFIX_OPERATOR = "PREFIX"; /** Enables {@code PHRASE} operator (") */ - public static final String PHRASE_OPERATOR = "PHRASE"; + String PHRASE_OPERATOR = "PHRASE"; /** Enables {@code PRECEDENCE} operators: {@code (} and {@code )} */ - public static final String PRECEDENCE_OPERATORS = "PRECEDENCE"; + String PRECEDENCE_OPERATORS = "PRECEDENCE"; /** Enables {@code ESCAPE} operator (\) */ - public static final String ESCAPE_OPERATOR = "ESCAPE"; + String ESCAPE_OPERATOR = "ESCAPE"; /** Enables {@code WHITESPACE} operators: ' ' '\n' '\r' '\t' */ - public static final String WHITESPACE_OPERATOR = "WHITESPACE"; + String WHITESPACE_OPERATOR = "WHITESPACE"; /** Enables {@code FUZZY} operator (~) */ - public static final String FUZZY_OPERATOR = "FUZZY"; + String FUZZY_OPERATOR = "FUZZY"; /** Enables {@code NEAR} operator (~) */ - public static final String NEAR_OPERATOR = "NEAR"; + String NEAR_OPERATOR = "NEAR"; } http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/3e59571c/ranger_solrj/src/main/java/org/apache/solr/common/params/SpatialParams.java ---------------------------------------------------------------------- diff --git a/ranger_solrj/src/main/java/org/apache/solr/common/params/SpatialParams.java b/ranger_solrj/src/main/java/org/apache/solr/common/params/SpatialParams.java index 043f216..4194a3c 100644 --- a/ranger_solrj/src/main/java/org/apache/solr/common/params/SpatialParams.java +++ b/ranger_solrj/src/main/java/org/apache/solr/common/params/SpatialParams.java @@ -22,20 +22,20 @@ package org.apache.solr.common.params; * **/ public interface SpatialParams { - public static final String POINT = "pt"; - public static final String DISTANCE = "d"; - public static final String FIELD = "sfield"; // the field that contains the points we are measuring from "pt" + String POINT = "pt"; + String DISTANCE = "d"; + String FIELD = "sfield"; // the field that contains the points we are measuring from "pt" /** * km - kilometers * mi - miles */ - public static final String UNITS = "units"; + String UNITS = "units"; /** * The distance measure to use. */ - public static final String MEASURE = "meas"; + String MEASURE = "meas"; /** * The radius of the sphere to use to in calculating spherical distances like Haversine */ - public static final String SPHERE_RADIUS = "sphere_radius"; + String SPHERE_RADIUS = "sphere_radius"; } http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/3e59571c/ranger_solrj/src/main/java/org/apache/solr/common/params/SpellingParams.java ---------------------------------------------------------------------- diff --git a/ranger_solrj/src/main/java/org/apache/solr/common/params/SpellingParams.java b/ranger_solrj/src/main/java/org/apache/solr/common/params/SpellingParams.java index 918592d..0a54606 100644 --- a/ranger_solrj/src/main/java/org/apache/solr/common/params/SpellingParams.java +++ b/ranger_solrj/src/main/java/org/apache/solr/common/params/SpellingParams.java @@ -24,13 +24,13 @@ package org.apache.solr.common.params; */ public interface SpellingParams { - public static final String SPELLCHECK_PREFIX = "spellcheck."; + String SPELLCHECK_PREFIX = "spellcheck."; /** * The name of the dictionary to be used for giving the suggestion for a * request. The value for this parameter is configured in solrconfig.xml */ - public static final String SPELLCHECK_DICT = SPELLCHECK_PREFIX + "dictionary"; + String SPELLCHECK_DICT = SPELLCHECK_PREFIX + "dictionary"; /** * The count of suggestions to return for each query term not in the index and/or dictionary. @@ -39,7 +39,7 @@ public interface SpellingParams { * returned. If it is more than one then a maximum of given suggestions are * returned for each token in the query. */ - public static final String SPELLCHECK_COUNT = SPELLCHECK_PREFIX + "count"; + String SPELLCHECK_COUNT = SPELLCHECK_PREFIX + "count"; /** * The count of suggestions to return for each query term existing in the index and/or dictionary. @@ -47,7 +47,7 @@ public interface SpellingParams { * If this parameter is absent in the request then no suggestions are generated. This parameter allows * for receiving alternative terms to use in context-sensitive spelling corrections. */ - public static final String SPELLCHECK_ALTERNATIVE_TERM_COUNT = SPELLCHECK_PREFIX + "alternativeTermCount"; + String SPELLCHECK_ALTERNATIVE_TERM_COUNT = SPELLCHECK_PREFIX + "alternativeTermCount"; /** * <p> @@ -64,7 +64,7 @@ public interface SpellingParams { * for creating "did-you-mean" suggestions for queries that return a low number of hits. * </p> */ - public static final String SPELLCHECK_MAX_RESULTS_FOR_SUGGEST = SPELLCHECK_PREFIX + "maxResultsForSuggest"; + String SPELLCHECK_MAX_RESULTS_FOR_SUGGEST = SPELLCHECK_PREFIX + "maxResultsForSuggest"; /** * When this parameter is set to true and the misspelled word exists in the @@ -73,7 +73,7 @@ public interface SpellingParams { * <p> * <b>This is applicable only for dictionaries built from Solr fields.</b> */ - public static final String SPELLCHECK_ONLY_MORE_POPULAR = SPELLCHECK_PREFIX + "onlyMorePopular"; + String SPELLCHECK_ONLY_MORE_POPULAR = SPELLCHECK_PREFIX + "onlyMorePopular"; /** * Whether to use the extended response format, which is more complicated but @@ -82,7 +82,7 @@ public interface SpellingParams { * <p> * <b>This is applicable only for dictionaries built from Solr fields.</b> */ - public static final String SPELLCHECK_EXTENDED_RESULTS = SPELLCHECK_PREFIX + "extendedResults"; + String SPELLCHECK_EXTENDED_RESULTS = SPELLCHECK_PREFIX + "extendedResults"; /** * Use the value for this parameter as the query to spell check. @@ -90,28 +90,28 @@ public interface SpellingParams { * This parameter is <b>optional</b>. If absent, then the q parameter is * used. */ - public static final String SPELLCHECK_Q = SPELLCHECK_PREFIX + "q"; + String SPELLCHECK_Q = SPELLCHECK_PREFIX + "q"; /** * Whether to build the index or not. Optional and false by default. */ - public static final String SPELLCHECK_BUILD = SPELLCHECK_PREFIX + "build"; + String SPELLCHECK_BUILD = SPELLCHECK_PREFIX + "build"; /** * Whether to reload the index. Optional and false by default. */ - public static final String SPELLCHECK_RELOAD = SPELLCHECK_PREFIX + "reload"; + String SPELLCHECK_RELOAD = SPELLCHECK_PREFIX + "reload"; /** * Take the top suggestion for each token and create a new query from it */ - public static final String SPELLCHECK_COLLATE = SPELLCHECK_PREFIX + "collate"; + String SPELLCHECK_COLLATE = SPELLCHECK_PREFIX + "collate"; /** * <p> * The maximum number of collations to return. Default=1. Ignored if "spellcheck.collate" is false. * </p> */ - public static final String SPELLCHECK_MAX_COLLATIONS = SPELLCHECK_PREFIX + "maxCollations"; + String SPELLCHECK_MAX_COLLATIONS = SPELLCHECK_PREFIX + "maxCollations"; /** * <p> * The maximum number of collations to test by querying against the index. @@ -120,7 +120,7 @@ public interface SpellingParams { * Default=0. Ignored of "spellcheck.collate" is false. * </p> */ - public static final String SPELLCHECK_MAX_COLLATION_TRIES = SPELLCHECK_PREFIX + "maxCollationTries"; + String SPELLCHECK_MAX_COLLATION_TRIES = SPELLCHECK_PREFIX + "maxCollationTries"; /** * <p> * The maximum number of word correction combinations to rank and evaluate prior to deciding which collation @@ -128,7 +128,7 @@ public interface SpellingParams { * many misspelled words. The default is 10,000 combinations. * </p> */ - public static final String SPELLCHECK_MAX_COLLATION_EVALUATIONS = SPELLCHECK_PREFIX + "maxCollationEvaluations"; + String SPELLCHECK_MAX_COLLATION_EVALUATIONS = SPELLCHECK_PREFIX + "maxCollationEvaluations"; /** * <p> * For use with {@link SpellingParams#SPELLCHECK_MAX_COLLATION_TRIES} and @@ -144,7 +144,7 @@ public interface SpellingParams { * When {@link SpellingParams#SPELLCHECK_COLLATE_EXTENDED_RESULTS} is FALSE, this optimization is always performed. * </p> */ - public static final String SPELLCHECK_COLLATE_MAX_COLLECT_DOCS = SPELLCHECK_PREFIX + "collateMaxCollectDocs"; + String SPELLCHECK_COLLATE_MAX_COLLECT_DOCS = SPELLCHECK_PREFIX + "collateMaxCollectDocs"; /** * <p> * Whether to use the Extended Results Format for collations. @@ -156,7 +156,7 @@ public interface SpellingParams { * then the hit counts returned by this will be estimated. * </p> */ - public static final String SPELLCHECK_COLLATE_EXTENDED_RESULTS = SPELLCHECK_PREFIX + "collateExtendedResults"; + String SPELLCHECK_COLLATE_EXTENDED_RESULTS = SPELLCHECK_PREFIX + "collateExtendedResults"; /** * <p> @@ -165,10 +165,10 @@ public interface SpellingParams { * with "mm=100%", then use "spellcheck.collateParam.mm=100%". * </p> */ - public static final String SPELLCHECK_COLLATE_PARAM_OVERRIDE = SPELLCHECK_PREFIX + "collateParam."; + String SPELLCHECK_COLLATE_PARAM_OVERRIDE = SPELLCHECK_PREFIX + "collateParam."; /** * Certain spelling implementations may allow for an accuracy setting. */ - public static final String SPELLCHECK_ACCURACY = SPELLCHECK_PREFIX + "accuracy"; + String SPELLCHECK_ACCURACY = SPELLCHECK_PREFIX + "accuracy"; } http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/3e59571c/ranger_solrj/src/main/java/org/apache/solr/common/params/StatsParams.java ---------------------------------------------------------------------- diff --git a/ranger_solrj/src/main/java/org/apache/solr/common/params/StatsParams.java b/ranger_solrj/src/main/java/org/apache/solr/common/params/StatsParams.java index 6fb7935..d287fa3 100644 --- a/ranger_solrj/src/main/java/org/apache/solr/common/params/StatsParams.java +++ b/ranger_solrj/src/main/java/org/apache/solr/common/params/StatsParams.java @@ -21,8 +21,8 @@ package org.apache.solr.common.params; * Stats Parameters */ public interface StatsParams { - public static final String STATS = "stats"; - public static final String STATS_FIELD = STATS + ".field"; - public static final String STATS_FACET = STATS + ".facet"; - public static final String STATS_CALC_DISTINCT = STATS + ".calcdistinct"; + String STATS = "stats"; + String STATS_FIELD = STATS + ".field"; + String STATS_FACET = STATS + ".facet"; + String STATS_CALC_DISTINCT = STATS + ".calcdistinct"; } http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/3e59571c/ranger_solrj/src/main/java/org/apache/solr/common/params/TermVectorParams.java ---------------------------------------------------------------------- diff --git a/ranger_solrj/src/main/java/org/apache/solr/common/params/TermVectorParams.java b/ranger_solrj/src/main/java/org/apache/solr/common/params/TermVectorParams.java index cfa1afd..5c81b5e 100644 --- a/ranger_solrj/src/main/java/org/apache/solr/common/params/TermVectorParams.java +++ b/ranger_solrj/src/main/java/org/apache/solr/common/params/TermVectorParams.java @@ -23,44 +23,44 @@ package org.apache.solr.common.params; **/ public interface TermVectorParams { - public static final String TV_PREFIX = "tv."; + String TV_PREFIX = "tv."; /** * Return Term Frequency info * */ - public static final String TF = TV_PREFIX + "tf"; + String TF = TV_PREFIX + "tf"; /** * Return Term Vector position information * * */ - public static final String POSITIONS = TV_PREFIX + "positions"; + String POSITIONS = TV_PREFIX + "positions"; /** * Return offset information, if available * */ - public static final String OFFSETS = TV_PREFIX + "offsets"; + String OFFSETS = TV_PREFIX + "offsets"; /** * Return IDF information. May be expensive * */ - public static final String DF = TV_PREFIX + "df"; + String DF = TV_PREFIX + "df"; /** * Return TF-IDF calculation, i.e. (tf / idf). May be expensive. */ - public static final String TF_IDF = TV_PREFIX + "tf_idf"; + String TF_IDF = TV_PREFIX + "tf_idf"; /** * Return all the options: TF, positions, offsets, idf */ - public static final String ALL = TV_PREFIX + "all"; + String ALL = TV_PREFIX + "all"; /** * The fields to get term vectors for */ - public static final String FIELDS = TV_PREFIX + "fl"; + String FIELDS = TV_PREFIX + "fl"; /** * The Doc Ids (Lucene internal ids) of the docs to get the term vectors for */ - public static final String DOC_IDS = TV_PREFIX + "docIds"; + String DOC_IDS = TV_PREFIX + "docIds"; }
