Repository: incubator-ranger Updated Branches: refs/heads/master 914c235ac -> 67e64d2e7
RANGER-964 - Fix licensing ordering in the headers. Committed by: coheigea. Reviewed by Velmurugan Periasamy. Project: http://git-wip-us.apache.org/repos/asf/incubator-ranger/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ranger/commit/67e64d2e Tree: http://git-wip-us.apache.org/repos/asf/incubator-ranger/tree/67e64d2e Diff: http://git-wip-us.apache.org/repos/asf/incubator-ranger/diff/67e64d2e Branch: refs/heads/master Commit: 67e64d2e7c1d5ba83078eaaedddd5946c1cba9e0 Parents: 914c235 Author: Colm O hEigeartaigh <[email protected]> Authored: Wed May 25 11:04:32 2016 +0100 Committer: Colm O hEigeartaigh <[email protected]> Committed: Thu May 26 16:31:56 2016 +0100 ---------------------------------------------------------------------- .../ranger/services/hdfs/HdfsClientTester.java | 2 +- .../services/hdfs/TestRangerServiceHdfs.java | 4 ++-- .../examples/sampleapp/RangerAuthorizer.java | 7 +++--- .../client/solrj/beans/BindingException.java | 4 ++-- .../solr/client/solrj/impl/CloudSolrClient.java | 4 ++-- .../client/solrj/impl/HttpClientConfigurer.java | 3 +-- .../client/solrj/impl/NoOpResponseParser.java | 4 ++-- .../solrj/request/AbstractUpdateRequest.java | 3 ++- .../request/ContentStreamUpdateRequest.java | 2 +- .../client/solrj/request/IsUpdateRequest.java | 3 +-- .../solr/client/solrj/response/Group.java | 6 ++--- .../client/solrj/response/GroupCommand.java | 6 ++--- .../client/solrj/response/GroupResponse.java | 5 ++-- .../client/solrj/response/IntervalFacet.java | 9 +++---- .../solr/client/solrj/response/RangeFacet.java | 4 ++-- .../solrj/response/SpellCheckResponse.java | 3 ++- .../client/solrj/response/TermsResponse.java | 3 ++- .../org/apache/solr/common/EnumFieldValue.java | 4 ++-- .../org/apache/solr/common/StringUtils.java | 6 ++--- .../org/apache/solr/common/cloud/Aliases.java | 4 ++-- .../solr/common/cloud/BeforeReconnect.java | 4 ++-- .../solr/common/cloud/ClosableThread.java | 4 ++-- .../apache/solr/common/cloud/ClusterState.java | 4 ++-- .../solr/common/cloud/ClusterStateUtil.java | 4 ++-- .../solr/common/cloud/CompositeIdRouter.java | 4 ++-- .../solr/common/cloud/ConnectionManager.java | 6 ++--- .../common/cloud/DefaultConnectionStrategy.java | 4 ++-- .../solr/common/cloud/DefaultZkACLProvider.java | 14 +++++------ .../cloud/DefaultZkCredentialsProvider.java | 10 ++++---- .../apache/solr/common/cloud/DocCollection.java | 4 ++-- .../org/apache/solr/common/cloud/DocRouter.java | 4 ++-- .../solr/common/cloud/HashBasedRouter.java | 4 ++-- .../solr/common/cloud/ImplicitDocRouter.java | 4 ++-- .../apache/solr/common/cloud/OnReconnect.java | 4 ++-- .../apache/solr/common/cloud/PlainIdRouter.java | 5 ++-- .../org/apache/solr/common/cloud/Replica.java | 4 ++-- .../apache/solr/common/cloud/RoutingRule.java | 4 ++-- .../solr/common/cloud/SaslZkACLProvider.java | 4 ++-- .../org/apache/solr/common/cloud/Slice.java | 4 ++-- .../apache/solr/common/cloud/SolrZkClient.java | 4 ++-- .../apache/solr/common/cloud/SolrZooKeeper.java | 4 ++-- ...ParamsAllAndReadonlyDigestZkACLProvider.java | 25 ++++++++++---------- ...tCredentialsDigestZkCredentialsProvider.java | 18 +++++++------- .../apache/solr/common/cloud/ZkACLProvider.java | 12 +++++----- .../cloud/ZkClientConnectionStrategy.java | 4 ++-- .../apache/solr/common/cloud/ZkCmdExecutor.java | 4 ++-- .../solr/common/cloud/ZkCoreNodeProps.java | 4 ++-- .../common/cloud/ZkCredentialsProvider.java | 8 +++---- .../apache/solr/common/cloud/ZkNodeProps.java | 4 ++-- .../apache/solr/common/cloud/ZkStateReader.java | 4 ++-- .../solr/common/cloud/ZooKeeperException.java | 3 +-- .../org/apache/solr/common/luke/FieldFlag.java | 2 +- .../solr/common/params/CollectionParams.java | 3 ++- .../apache/solr/common/params/EventParams.java | 3 ++- .../common/params/QueryElevationParams.java | 3 +-- .../apache/solr/common/params/SimpleParams.java | 4 ++-- .../solr/common/params/SpatialParams.java | 3 ++- .../solr/common/params/TermVectorParams.java | 2 +- .../org/apache/solr/common/util/DateUtil.java | 5 ++-- .../apache/solr/common/util/ExecutorUtil.java | 4 ++-- .../java/org/apache/solr/common/util/Hash.java | 4 ++-- .../org/apache/solr/common/util/IOUtils.java | 14 +++++------ .../solr/common/util/ObjectReleaseTracker.java | 4 ++-- .../org/apache/solr/common/util/RetryUtil.java | 4 ++-- .../solr/common/util/SimpleOrderedMap.java | 4 ++-- .../common/util/SolrjNamedThreadFactory.java | 13 +++++----- 66 files changed, 176 insertions(+), 171 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/67e64d2e/hdfs-agent/src/test/java/org/apache/ranger/services/hdfs/HdfsClientTester.java ---------------------------------------------------------------------- diff --git a/hdfs-agent/src/test/java/org/apache/ranger/services/hdfs/HdfsClientTester.java b/hdfs-agent/src/test/java/org/apache/ranger/services/hdfs/HdfsClientTester.java index 2e8290c..ff2802a 100644 --- a/hdfs-agent/src/test/java/org/apache/ranger/services/hdfs/HdfsClientTester.java +++ b/hdfs-agent/src/test/java/org/apache/ranger/services/hdfs/HdfsClientTester.java @@ -17,7 +17,7 @@ * under the License. */ - package org.apache.ranger.services.hdfs; +package org.apache.ranger.services.hdfs; import java.io.IOException; import java.io.InputStream; http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/67e64d2e/hdfs-agent/src/test/java/org/apache/ranger/services/hdfs/TestRangerServiceHdfs.java ---------------------------------------------------------------------- diff --git a/hdfs-agent/src/test/java/org/apache/ranger/services/hdfs/TestRangerServiceHdfs.java b/hdfs-agent/src/test/java/org/apache/ranger/services/hdfs/TestRangerServiceHdfs.java index 377b7e5..053fbb8 100644 --- a/hdfs-agent/src/test/java/org/apache/ranger/services/hdfs/TestRangerServiceHdfs.java +++ b/hdfs-agent/src/test/java/org/apache/ranger/services/hdfs/TestRangerServiceHdfs.java @@ -1,5 +1,3 @@ -package org.apache.ranger.services.hdfs; - /* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file @@ -19,6 +17,8 @@ package org.apache.ranger.services.hdfs; * under the License. */ +package org.apache.ranger.services.hdfs; + import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/67e64d2e/ranger-examples/plugin-sampleapp/src/main/java/org/apache/ranger/examples/sampleapp/RangerAuthorizer.java ---------------------------------------------------------------------- diff --git a/ranger-examples/plugin-sampleapp/src/main/java/org/apache/ranger/examples/sampleapp/RangerAuthorizer.java b/ranger-examples/plugin-sampleapp/src/main/java/org/apache/ranger/examples/sampleapp/RangerAuthorizer.java index e35dce1..ce881a3 100644 --- a/ranger-examples/plugin-sampleapp/src/main/java/org/apache/ranger/examples/sampleapp/RangerAuthorizer.java +++ b/ranger-examples/plugin-sampleapp/src/main/java/org/apache/ranger/examples/sampleapp/RangerAuthorizer.java @@ -1,6 +1,3 @@ -package org.apache.ranger.examples.sampleapp; - -import java.util.Set; /* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file @@ -20,6 +17,10 @@ import java.util.Set; * under the License. */ +package org.apache.ranger.examples.sampleapp; + +import java.util.Set; + import org.apache.ranger.plugin.audit.RangerDefaultAuditHandler; import org.apache.ranger.plugin.service.RangerBasePlugin; import org.apache.ranger.plugin.policyengine.RangerAccessResourceImpl; http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/67e64d2e/ranger_solrj/src/main/java/org/apache/solr/client/solrj/beans/BindingException.java ---------------------------------------------------------------------- diff --git a/ranger_solrj/src/main/java/org/apache/solr/client/solrj/beans/BindingException.java b/ranger_solrj/src/main/java/org/apache/solr/client/solrj/beans/BindingException.java index cd10138..fc9ebfa 100644 --- a/ranger_solrj/src/main/java/org/apache/solr/client/solrj/beans/BindingException.java +++ b/ranger_solrj/src/main/java/org/apache/solr/client/solrj/beans/BindingException.java @@ -1,5 +1,3 @@ -package org.apache.solr.client.solrj.beans; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -17,6 +15,8 @@ package org.apache.solr.client.solrj.beans; * limitations under the License. */ +package org.apache.solr.client.solrj.beans; + public class BindingException extends RuntimeException { public BindingException(String message) { http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/67e64d2e/ranger_solrj/src/main/java/org/apache/solr/client/solrj/impl/CloudSolrClient.java ---------------------------------------------------------------------- diff --git a/ranger_solrj/src/main/java/org/apache/solr/client/solrj/impl/CloudSolrClient.java b/ranger_solrj/src/main/java/org/apache/solr/client/solrj/impl/CloudSolrClient.java index 8272813..8508268 100644 --- a/ranger_solrj/src/main/java/org/apache/solr/client/solrj/impl/CloudSolrClient.java +++ b/ranger_solrj/src/main/java/org/apache/solr/client/solrj/impl/CloudSolrClient.java @@ -1,5 +1,3 @@ -package org.apache.solr.client.solrj.impl; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -17,6 +15,8 @@ package org.apache.solr.client.solrj.impl; * limitations under the License. */ +package org.apache.solr.client.solrj.impl; + import org.apache.http.NoHttpResponseException; import org.apache.http.client.HttpClient; import org.apache.http.conn.ConnectTimeoutException; http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/67e64d2e/ranger_solrj/src/main/java/org/apache/solr/client/solrj/impl/HttpClientConfigurer.java ---------------------------------------------------------------------- diff --git a/ranger_solrj/src/main/java/org/apache/solr/client/solrj/impl/HttpClientConfigurer.java b/ranger_solrj/src/main/java/org/apache/solr/client/solrj/impl/HttpClientConfigurer.java index 1d370ff..78ed726 100644 --- a/ranger_solrj/src/main/java/org/apache/solr/client/solrj/impl/HttpClientConfigurer.java +++ b/ranger_solrj/src/main/java/org/apache/solr/client/solrj/impl/HttpClientConfigurer.java @@ -1,5 +1,3 @@ -package org.apache.solr.client.solrj.impl; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -17,6 +15,7 @@ package org.apache.solr.client.solrj.impl; * limitations under the License. */ +package org.apache.solr.client.solrj.impl; import org.apache.http.conn.ssl.SSLSocketFactory; import org.apache.http.impl.client.DefaultHttpClient; http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/67e64d2e/ranger_solrj/src/main/java/org/apache/solr/client/solrj/impl/NoOpResponseParser.java ---------------------------------------------------------------------- diff --git a/ranger_solrj/src/main/java/org/apache/solr/client/solrj/impl/NoOpResponseParser.java b/ranger_solrj/src/main/java/org/apache/solr/client/solrj/impl/NoOpResponseParser.java index 267dd25..e9a346c 100644 --- a/ranger_solrj/src/main/java/org/apache/solr/client/solrj/impl/NoOpResponseParser.java +++ b/ranger_solrj/src/main/java/org/apache/solr/client/solrj/impl/NoOpResponseParser.java @@ -1,5 +1,3 @@ -package org.apache.solr.client.solrj.impl; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -17,6 +15,8 @@ package org.apache.solr.client.solrj.impl; * limitations under the License. */ +package org.apache.solr.client.solrj.impl; + import org.apache.commons.io.IOUtils; import org.apache.solr.client.solrj.ResponseParser; import org.apache.solr.common.SolrException; http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/67e64d2e/ranger_solrj/src/main/java/org/apache/solr/client/solrj/request/AbstractUpdateRequest.java ---------------------------------------------------------------------- diff --git a/ranger_solrj/src/main/java/org/apache/solr/client/solrj/request/AbstractUpdateRequest.java b/ranger_solrj/src/main/java/org/apache/solr/client/solrj/request/AbstractUpdateRequest.java index 8fbc463..0588fc1 100644 --- a/ranger_solrj/src/main/java/org/apache/solr/client/solrj/request/AbstractUpdateRequest.java +++ b/ranger_solrj/src/main/java/org/apache/solr/client/solrj/request/AbstractUpdateRequest.java @@ -1,4 +1,3 @@ -package org.apache.solr.client.solrj.request; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +15,8 @@ package org.apache.solr.client.solrj.request; * limitations under the License. */ +package org.apache.solr.client.solrj.request; + import org.apache.solr.client.solrj.SolrClient; import org.apache.solr.client.solrj.SolrRequest; import org.apache.solr.client.solrj.response.UpdateResponse; http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/67e64d2e/ranger_solrj/src/main/java/org/apache/solr/client/solrj/request/ContentStreamUpdateRequest.java ---------------------------------------------------------------------- diff --git a/ranger_solrj/src/main/java/org/apache/solr/client/solrj/request/ContentStreamUpdateRequest.java b/ranger_solrj/src/main/java/org/apache/solr/client/solrj/request/ContentStreamUpdateRequest.java index 2697e3f..44e37c9 100644 --- a/ranger_solrj/src/main/java/org/apache/solr/client/solrj/request/ContentStreamUpdateRequest.java +++ b/ranger_solrj/src/main/java/org/apache/solr/client/solrj/request/ContentStreamUpdateRequest.java @@ -1,4 +1,3 @@ -package org.apache.solr.client.solrj.request; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +15,7 @@ package org.apache.solr.client.solrj.request; * limitations under the License. */ +package org.apache.solr.client.solrj.request; import org.apache.solr.common.util.ContentStream; import org.apache.solr.common.util.ContentStreamBase; http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/67e64d2e/ranger_solrj/src/main/java/org/apache/solr/client/solrj/request/IsUpdateRequest.java ---------------------------------------------------------------------- diff --git a/ranger_solrj/src/main/java/org/apache/solr/client/solrj/request/IsUpdateRequest.java b/ranger_solrj/src/main/java/org/apache/solr/client/solrj/request/IsUpdateRequest.java index ec49e30..c1907d0 100644 --- a/ranger_solrj/src/main/java/org/apache/solr/client/solrj/request/IsUpdateRequest.java +++ b/ranger_solrj/src/main/java/org/apache/solr/client/solrj/request/IsUpdateRequest.java @@ -1,5 +1,3 @@ -package org.apache.solr.client.solrj.request; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -17,6 +15,7 @@ package org.apache.solr.client.solrj.request; * limitations under the License. */ +package org.apache.solr.client.solrj.request; /** * Marker class so that we can determine which requests are updates. http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/67e64d2e/ranger_solrj/src/main/java/org/apache/solr/client/solrj/response/Group.java ---------------------------------------------------------------------- diff --git a/ranger_solrj/src/main/java/org/apache/solr/client/solrj/response/Group.java b/ranger_solrj/src/main/java/org/apache/solr/client/solrj/response/Group.java index 2ee0389..bc4271a 100644 --- a/ranger_solrj/src/main/java/org/apache/solr/client/solrj/response/Group.java +++ b/ranger_solrj/src/main/java/org/apache/solr/client/solrj/response/Group.java @@ -1,5 +1,3 @@ -package org.apache.solr.client.solrj.response; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -17,6 +15,8 @@ package org.apache.solr.client.solrj.response; * limitations under the License. */ +package org.apache.solr.client.solrj.response; + import org.apache.solr.common.SolrDocumentList; import java.io.Serializable; @@ -66,4 +66,4 @@ public class Group implements Serializable { return _result; } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/67e64d2e/ranger_solrj/src/main/java/org/apache/solr/client/solrj/response/GroupCommand.java ---------------------------------------------------------------------- diff --git a/ranger_solrj/src/main/java/org/apache/solr/client/solrj/response/GroupCommand.java b/ranger_solrj/src/main/java/org/apache/solr/client/solrj/response/GroupCommand.java index c2c8127..58bb9cb 100644 --- a/ranger_solrj/src/main/java/org/apache/solr/client/solrj/response/GroupCommand.java +++ b/ranger_solrj/src/main/java/org/apache/solr/client/solrj/response/GroupCommand.java @@ -1,5 +1,3 @@ -package org.apache.solr.client.solrj.response; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -17,6 +15,8 @@ package org.apache.solr.client.solrj.response; * limitations under the License. */ +package org.apache.solr.client.solrj.response; + import java.io.Serializable; import java.util.ArrayList; import java.util.List; @@ -122,4 +122,4 @@ public class GroupCommand implements Serializable { return _ngroups; } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/67e64d2e/ranger_solrj/src/main/java/org/apache/solr/client/solrj/response/GroupResponse.java ---------------------------------------------------------------------- diff --git a/ranger_solrj/src/main/java/org/apache/solr/client/solrj/response/GroupResponse.java b/ranger_solrj/src/main/java/org/apache/solr/client/solrj/response/GroupResponse.java index 210bb5e..3549101 100644 --- a/ranger_solrj/src/main/java/org/apache/solr/client/solrj/response/GroupResponse.java +++ b/ranger_solrj/src/main/java/org/apache/solr/client/solrj/response/GroupResponse.java @@ -1,5 +1,3 @@ -package org.apache.solr.client.solrj.response; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,7 @@ package org.apache.solr.client.solrj.response; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.client.solrj.response; import java.io.Serializable; import java.util.ArrayList; @@ -53,4 +52,4 @@ public class GroupResponse implements Serializable { public List<GroupCommand> getValues() { return _values; } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/67e64d2e/ranger_solrj/src/main/java/org/apache/solr/client/solrj/response/IntervalFacet.java ---------------------------------------------------------------------- diff --git a/ranger_solrj/src/main/java/org/apache/solr/client/solrj/response/IntervalFacet.java b/ranger_solrj/src/main/java/org/apache/solr/client/solrj/response/IntervalFacet.java index 1f91fe8..b6ec6c3 100644 --- a/ranger_solrj/src/main/java/org/apache/solr/client/solrj/response/IntervalFacet.java +++ b/ranger_solrj/src/main/java/org/apache/solr/client/solrj/response/IntervalFacet.java @@ -1,7 +1,3 @@ -package org.apache.solr.client.solrj.response; - -import java.util.List; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -18,6 +14,11 @@ import java.util.List; * See the License for the specific language governing permissions and * limitations under the License. */ + +package org.apache.solr.client.solrj.response; + +import java.util.List; + /** * Objects of this class will contain the result of all the intervals defined * for a specific field. http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/67e64d2e/ranger_solrj/src/main/java/org/apache/solr/client/solrj/response/RangeFacet.java ---------------------------------------------------------------------- diff --git a/ranger_solrj/src/main/java/org/apache/solr/client/solrj/response/RangeFacet.java b/ranger_solrj/src/main/java/org/apache/solr/client/solrj/response/RangeFacet.java index 52b4e6b..fbb5c31 100644 --- a/ranger_solrj/src/main/java/org/apache/solr/client/solrj/response/RangeFacet.java +++ b/ranger_solrj/src/main/java/org/apache/solr/client/solrj/response/RangeFacet.java @@ -1,5 +1,3 @@ -package org.apache.solr.client.solrj.response; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -17,6 +15,8 @@ package org.apache.solr.client.solrj.response; * limitations under the License. */ +package org.apache.solr.client.solrj.response; + import java.util.ArrayList; import java.util.List; http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/67e64d2e/ranger_solrj/src/main/java/org/apache/solr/client/solrj/response/SpellCheckResponse.java ---------------------------------------------------------------------- diff --git a/ranger_solrj/src/main/java/org/apache/solr/client/solrj/response/SpellCheckResponse.java b/ranger_solrj/src/main/java/org/apache/solr/client/solrj/response/SpellCheckResponse.java index a3ae45d..798c088 100644 --- a/ranger_solrj/src/main/java/org/apache/solr/client/solrj/response/SpellCheckResponse.java +++ b/ranger_solrj/src/main/java/org/apache/solr/client/solrj/response/SpellCheckResponse.java @@ -1,4 +1,3 @@ -package org.apache.solr.client.solrj.response; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +15,8 @@ package org.apache.solr.client.solrj.response; * limitations under the License. */ +package org.apache.solr.client.solrj.response; + import org.apache.solr.common.util.NamedList; import java.util.ArrayList; http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/67e64d2e/ranger_solrj/src/main/java/org/apache/solr/client/solrj/response/TermsResponse.java ---------------------------------------------------------------------- diff --git a/ranger_solrj/src/main/java/org/apache/solr/client/solrj/response/TermsResponse.java b/ranger_solrj/src/main/java/org/apache/solr/client/solrj/response/TermsResponse.java index 5d8c0b7..29be7dd 100644 --- a/ranger_solrj/src/main/java/org/apache/solr/client/solrj/response/TermsResponse.java +++ b/ranger_solrj/src/main/java/org/apache/solr/client/solrj/response/TermsResponse.java @@ -1,4 +1,3 @@ -package org.apache.solr.client.solrj.response; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +15,8 @@ package org.apache.solr.client.solrj.response; * limitations under the License. */ +package org.apache.solr.client.solrj.response; + import org.apache.solr.common.util.NamedList; import java.util.ArrayList; http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/67e64d2e/ranger_solrj/src/main/java/org/apache/solr/common/EnumFieldValue.java ---------------------------------------------------------------------- diff --git a/ranger_solrj/src/main/java/org/apache/solr/common/EnumFieldValue.java b/ranger_solrj/src/main/java/org/apache/solr/common/EnumFieldValue.java index 50d1fb0..0e92a11 100644 --- a/ranger_solrj/src/main/java/org/apache/solr/common/EnumFieldValue.java +++ b/ranger_solrj/src/main/java/org/apache/solr/common/EnumFieldValue.java @@ -1,5 +1,3 @@ -package org.apache.solr.common; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -17,6 +15,8 @@ package org.apache.solr.common; * limitations under the License. */ +package org.apache.solr.common; + import java.io.Serializable; /** http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/67e64d2e/ranger_solrj/src/main/java/org/apache/solr/common/StringUtils.java ---------------------------------------------------------------------- diff --git a/ranger_solrj/src/main/java/org/apache/solr/common/StringUtils.java b/ranger_solrj/src/main/java/org/apache/solr/common/StringUtils.java index 00fef63..4d2da92 100644 --- a/ranger_solrj/src/main/java/org/apache/solr/common/StringUtils.java +++ b/ranger_solrj/src/main/java/org/apache/solr/common/StringUtils.java @@ -1,5 +1,3 @@ -package org.apache.solr.common; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -17,10 +15,12 @@ package org.apache.solr.common; * limitations under the License. */ +package org.apache.solr.common; + public class StringUtils { public static boolean isEmpty(String s) { return (s == null) || s.isEmpty(); } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/67e64d2e/ranger_solrj/src/main/java/org/apache/solr/common/cloud/Aliases.java ---------------------------------------------------------------------- diff --git a/ranger_solrj/src/main/java/org/apache/solr/common/cloud/Aliases.java b/ranger_solrj/src/main/java/org/apache/solr/common/cloud/Aliases.java index 1d18323..d335f89 100644 --- a/ranger_solrj/src/main/java/org/apache/solr/common/cloud/Aliases.java +++ b/ranger_solrj/src/main/java/org/apache/solr/common/cloud/Aliases.java @@ -1,5 +1,3 @@ -package org.apache.solr.common.cloud; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -17,6 +15,8 @@ package org.apache.solr.common.cloud; * limitations under the License. */ +package org.apache.solr.common.cloud; + import java.util.Collections; import java.util.HashMap; import java.util.Map; http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/67e64d2e/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 7777252..b904a46 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 @@ -1,5 +1,3 @@ -package org.apache.solr.common.cloud; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with this @@ -17,6 +15,8 @@ package org.apache.solr.common.cloud; * the License. */ +package org.apache.solr.common.cloud; + public interface BeforeReconnect { void command(); } http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/67e64d2e/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 09bc0c2..f49b0ed 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 @@ -1,5 +1,3 @@ -package org.apache.solr.common.cloud; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -17,6 +15,8 @@ package org.apache.solr.common.cloud; * limitations under the License. */ +package org.apache.solr.common.cloud; + /** * @deprecated because this class is no longer used internally and will be removed */ http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/67e64d2e/ranger_solrj/src/main/java/org/apache/solr/common/cloud/ClusterState.java ---------------------------------------------------------------------- diff --git a/ranger_solrj/src/main/java/org/apache/solr/common/cloud/ClusterState.java b/ranger_solrj/src/main/java/org/apache/solr/common/cloud/ClusterState.java index 1b14360..3a468ae 100644 --- a/ranger_solrj/src/main/java/org/apache/solr/common/cloud/ClusterState.java +++ b/ranger_solrj/src/main/java/org/apache/solr/common/cloud/ClusterState.java @@ -1,5 +1,3 @@ -package org.apache.solr.common.cloud; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -17,6 +15,8 @@ package org.apache.solr.common.cloud; * limitations under the License. */ +package org.apache.solr.common.cloud; + import org.apache.solr.common.SolrException; import org.apache.solr.common.SolrException.ErrorCode; import org.noggit.JSONWriter; http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/67e64d2e/ranger_solrj/src/main/java/org/apache/solr/common/cloud/ClusterStateUtil.java ---------------------------------------------------------------------- diff --git a/ranger_solrj/src/main/java/org/apache/solr/common/cloud/ClusterStateUtil.java b/ranger_solrj/src/main/java/org/apache/solr/common/cloud/ClusterStateUtil.java index fe74884..0cc98b1 100644 --- a/ranger_solrj/src/main/java/org/apache/solr/common/cloud/ClusterStateUtil.java +++ b/ranger_solrj/src/main/java/org/apache/solr/common/cloud/ClusterStateUtil.java @@ -1,5 +1,3 @@ -package org.apache.solr.common.cloud; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with this @@ -17,6 +15,8 @@ package org.apache.solr.common.cloud; * the License. */ +package org.apache.solr.common.cloud; + import java.util.Collection; import java.util.Collections; import java.util.Set; http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/67e64d2e/ranger_solrj/src/main/java/org/apache/solr/common/cloud/CompositeIdRouter.java ---------------------------------------------------------------------- diff --git a/ranger_solrj/src/main/java/org/apache/solr/common/cloud/CompositeIdRouter.java b/ranger_solrj/src/main/java/org/apache/solr/common/cloud/CompositeIdRouter.java index 5b1652d..668519c 100644 --- a/ranger_solrj/src/main/java/org/apache/solr/common/cloud/CompositeIdRouter.java +++ b/ranger_solrj/src/main/java/org/apache/solr/common/cloud/CompositeIdRouter.java @@ -1,5 +1,3 @@ -package org.apache.solr.common.cloud; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -17,6 +15,8 @@ package org.apache.solr.common.cloud; * limitations under the License. */ +package org.apache.solr.common.cloud; + import org.apache.solr.common.SolrException; import org.apache.solr.common.SolrInputDocument; import org.apache.solr.common.params.SolrParams; http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/67e64d2e/ranger_solrj/src/main/java/org/apache/solr/common/cloud/ConnectionManager.java ---------------------------------------------------------------------- diff --git a/ranger_solrj/src/main/java/org/apache/solr/common/cloud/ConnectionManager.java b/ranger_solrj/src/main/java/org/apache/solr/common/cloud/ConnectionManager.java index fd43f00..699f2ae 100644 --- a/ranger_solrj/src/main/java/org/apache/solr/common/cloud/ConnectionManager.java +++ b/ranger_solrj/src/main/java/org/apache/solr/common/cloud/ConnectionManager.java @@ -1,5 +1,3 @@ -package org.apache.solr.common.cloud; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -17,6 +15,8 @@ package org.apache.solr.common.cloud; * limitations under the License. */ +package org.apache.solr.common.cloud; + import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; @@ -234,4 +234,4 @@ public class ConnectionManager implements Watcher { "", e); } } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/67e64d2e/ranger_solrj/src/main/java/org/apache/solr/common/cloud/DefaultConnectionStrategy.java ---------------------------------------------------------------------- diff --git a/ranger_solrj/src/main/java/org/apache/solr/common/cloud/DefaultConnectionStrategy.java b/ranger_solrj/src/main/java/org/apache/solr/common/cloud/DefaultConnectionStrategy.java index c2f4a31..80cc3b2 100644 --- a/ranger_solrj/src/main/java/org/apache/solr/common/cloud/DefaultConnectionStrategy.java +++ b/ranger_solrj/src/main/java/org/apache/solr/common/cloud/DefaultConnectionStrategy.java @@ -1,5 +1,3 @@ -package org.apache.solr.common.cloud; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with this @@ -17,6 +15,8 @@ package org.apache.solr.common.cloud; * the License. */ +package org.apache.solr.common.cloud; + import java.io.IOException; import java.util.concurrent.TimeoutException; http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/67e64d2e/ranger_solrj/src/main/java/org/apache/solr/common/cloud/DefaultZkACLProvider.java ---------------------------------------------------------------------- diff --git a/ranger_solrj/src/main/java/org/apache/solr/common/cloud/DefaultZkACLProvider.java b/ranger_solrj/src/main/java/org/apache/solr/common/cloud/DefaultZkACLProvider.java index 9b0301a..e55ccf1 100644 --- a/ranger_solrj/src/main/java/org/apache/solr/common/cloud/DefaultZkACLProvider.java +++ b/ranger_solrj/src/main/java/org/apache/solr/common/cloud/DefaultZkACLProvider.java @@ -1,10 +1,3 @@ -package org.apache.solr.common.cloud; - -import java.util.List; - -import org.apache.zookeeper.ZooDefs; -import org.apache.zookeeper.data.ACL; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -22,6 +15,13 @@ import org.apache.zookeeper.data.ACL; * limitations under the License. */ +package org.apache.solr.common.cloud; + +import java.util.List; + +import org.apache.zookeeper.ZooDefs; +import org.apache.zookeeper.data.ACL; + public class DefaultZkACLProvider implements ZkACLProvider { private List<ACL> globalACLsToAdd; http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/67e64d2e/ranger_solrj/src/main/java/org/apache/solr/common/cloud/DefaultZkCredentialsProvider.java ---------------------------------------------------------------------- diff --git a/ranger_solrj/src/main/java/org/apache/solr/common/cloud/DefaultZkCredentialsProvider.java b/ranger_solrj/src/main/java/org/apache/solr/common/cloud/DefaultZkCredentialsProvider.java index ca09068..ce9ecc3 100644 --- a/ranger_solrj/src/main/java/org/apache/solr/common/cloud/DefaultZkCredentialsProvider.java +++ b/ranger_solrj/src/main/java/org/apache/solr/common/cloud/DefaultZkCredentialsProvider.java @@ -1,8 +1,3 @@ -package org.apache.solr.common.cloud; - -import java.util.ArrayList; -import java.util.Collection; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -20,6 +15,11 @@ import java.util.Collection; * limitations under the License. */ +package org.apache.solr.common.cloud; + +import java.util.ArrayList; +import java.util.Collection; + public class DefaultZkCredentialsProvider implements ZkCredentialsProvider { private Collection<ZkCredentials> zkCredentials; http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/67e64d2e/ranger_solrj/src/main/java/org/apache/solr/common/cloud/DocCollection.java ---------------------------------------------------------------------- diff --git a/ranger_solrj/src/main/java/org/apache/solr/common/cloud/DocCollection.java b/ranger_solrj/src/main/java/org/apache/solr/common/cloud/DocCollection.java index a5e4252..f905df5 100644 --- a/ranger_solrj/src/main/java/org/apache/solr/common/cloud/DocCollection.java +++ b/ranger_solrj/src/main/java/org/apache/solr/common/cloud/DocCollection.java @@ -1,5 +1,3 @@ -package org.apache.solr.common.cloud; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -17,6 +15,8 @@ package org.apache.solr.common.cloud; * limitations under the License. */ +package org.apache.solr.common.cloud; + import java.util.Collection; import java.util.HashMap; import java.util.Iterator; http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/67e64d2e/ranger_solrj/src/main/java/org/apache/solr/common/cloud/DocRouter.java ---------------------------------------------------------------------- diff --git a/ranger_solrj/src/main/java/org/apache/solr/common/cloud/DocRouter.java b/ranger_solrj/src/main/java/org/apache/solr/common/cloud/DocRouter.java index 24d00dd..e245005 100644 --- a/ranger_solrj/src/main/java/org/apache/solr/common/cloud/DocRouter.java +++ b/ranger_solrj/src/main/java/org/apache/solr/common/cloud/DocRouter.java @@ -1,5 +1,3 @@ -package org.apache.solr.common.cloud; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -17,6 +15,8 @@ package org.apache.solr.common.cloud; * limitations under the License. */ +package org.apache.solr.common.cloud; + import org.apache.solr.common.SolrException; import org.apache.solr.common.SolrInputDocument; import org.apache.solr.common.params.SolrParams; http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/67e64d2e/ranger_solrj/src/main/java/org/apache/solr/common/cloud/HashBasedRouter.java ---------------------------------------------------------------------- diff --git a/ranger_solrj/src/main/java/org/apache/solr/common/cloud/HashBasedRouter.java b/ranger_solrj/src/main/java/org/apache/solr/common/cloud/HashBasedRouter.java index 4132f01..d6e4319 100644 --- a/ranger_solrj/src/main/java/org/apache/solr/common/cloud/HashBasedRouter.java +++ b/ranger_solrj/src/main/java/org/apache/solr/common/cloud/HashBasedRouter.java @@ -1,5 +1,3 @@ -package org.apache.solr.common.cloud; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -17,6 +15,8 @@ package org.apache.solr.common.cloud; * limitations under the License. */ +package org.apache.solr.common.cloud; + import org.apache.solr.common.SolrException; import org.apache.solr.common.SolrInputDocument; import org.apache.solr.common.params.SolrParams; http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/67e64d2e/ranger_solrj/src/main/java/org/apache/solr/common/cloud/ImplicitDocRouter.java ---------------------------------------------------------------------- diff --git a/ranger_solrj/src/main/java/org/apache/solr/common/cloud/ImplicitDocRouter.java b/ranger_solrj/src/main/java/org/apache/solr/common/cloud/ImplicitDocRouter.java index 3b2e83d..859a045 100644 --- a/ranger_solrj/src/main/java/org/apache/solr/common/cloud/ImplicitDocRouter.java +++ b/ranger_solrj/src/main/java/org/apache/solr/common/cloud/ImplicitDocRouter.java @@ -1,5 +1,3 @@ -package org.apache.solr.common.cloud; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -17,6 +15,8 @@ package org.apache.solr.common.cloud; * limitations under the License. */ +package org.apache.solr.common.cloud; + import org.apache.solr.common.SolrException; import org.apache.solr.common.SolrInputDocument; import org.apache.solr.common.params.SolrParams; http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/67e64d2e/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 5c2672a..2e390a2 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 @@ -1,5 +1,3 @@ -package org.apache.solr.common.cloud; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with this @@ -17,6 +15,8 @@ package org.apache.solr.common.cloud; * the License. */ +package org.apache.solr.common.cloud; + public interface OnReconnect { void command(); } http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/67e64d2e/ranger_solrj/src/main/java/org/apache/solr/common/cloud/PlainIdRouter.java ---------------------------------------------------------------------- diff --git a/ranger_solrj/src/main/java/org/apache/solr/common/cloud/PlainIdRouter.java b/ranger_solrj/src/main/java/org/apache/solr/common/cloud/PlainIdRouter.java index bd14089..fb1210f 100644 --- a/ranger_solrj/src/main/java/org/apache/solr/common/cloud/PlainIdRouter.java +++ b/ranger_solrj/src/main/java/org/apache/solr/common/cloud/PlainIdRouter.java @@ -1,6 +1,3 @@ -package org.apache.solr.common.cloud; - - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -18,6 +15,8 @@ package org.apache.solr.common.cloud; * limitations under the License. */ +package org.apache.solr.common.cloud; + public class PlainIdRouter extends HashBasedRouter { public static final String NAME = "plain"; } http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/67e64d2e/ranger_solrj/src/main/java/org/apache/solr/common/cloud/Replica.java ---------------------------------------------------------------------- diff --git a/ranger_solrj/src/main/java/org/apache/solr/common/cloud/Replica.java b/ranger_solrj/src/main/java/org/apache/solr/common/cloud/Replica.java index ecd4837..bef338b 100644 --- a/ranger_solrj/src/main/java/org/apache/solr/common/cloud/Replica.java +++ b/ranger_solrj/src/main/java/org/apache/solr/common/cloud/Replica.java @@ -1,5 +1,3 @@ -package org.apache.solr.common.cloud; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -17,6 +15,8 @@ package org.apache.solr.common.cloud; * limitations under the License. */ +package org.apache.solr.common.cloud; + import org.noggit.JSONUtil; import java.util.Map; http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/67e64d2e/ranger_solrj/src/main/java/org/apache/solr/common/cloud/RoutingRule.java ---------------------------------------------------------------------- diff --git a/ranger_solrj/src/main/java/org/apache/solr/common/cloud/RoutingRule.java b/ranger_solrj/src/main/java/org/apache/solr/common/cloud/RoutingRule.java index 69f810f..915c71f 100644 --- a/ranger_solrj/src/main/java/org/apache/solr/common/cloud/RoutingRule.java +++ b/ranger_solrj/src/main/java/org/apache/solr/common/cloud/RoutingRule.java @@ -1,5 +1,3 @@ -package org.apache.solr.common.cloud; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -17,6 +15,8 @@ package org.apache.solr.common.cloud; * limitations under the License. */ +package org.apache.solr.common.cloud; + import java.util.ArrayList; import java.util.List; import java.util.Map; http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/67e64d2e/ranger_solrj/src/main/java/org/apache/solr/common/cloud/SaslZkACLProvider.java ---------------------------------------------------------------------- diff --git a/ranger_solrj/src/main/java/org/apache/solr/common/cloud/SaslZkACLProvider.java b/ranger_solrj/src/main/java/org/apache/solr/common/cloud/SaslZkACLProvider.java index 86ab25f..54f2eee 100644 --- a/ranger_solrj/src/main/java/org/apache/solr/common/cloud/SaslZkACLProvider.java +++ b/ranger_solrj/src/main/java/org/apache/solr/common/cloud/SaslZkACLProvider.java @@ -1,5 +1,3 @@ -package org.apache.solr.common.cloud; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -17,6 +15,8 @@ package org.apache.solr.common.cloud; * limitations under the License. */ +package org.apache.solr.common.cloud; + import java.util.ArrayList; import java.util.List; http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/67e64d2e/ranger_solrj/src/main/java/org/apache/solr/common/cloud/Slice.java ---------------------------------------------------------------------- diff --git a/ranger_solrj/src/main/java/org/apache/solr/common/cloud/Slice.java b/ranger_solrj/src/main/java/org/apache/solr/common/cloud/Slice.java index 70abf6e..6e0ca55 100644 --- a/ranger_solrj/src/main/java/org/apache/solr/common/cloud/Slice.java +++ b/ranger_solrj/src/main/java/org/apache/solr/common/cloud/Slice.java @@ -1,5 +1,3 @@ -package org.apache.solr.common.cloud; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -17,6 +15,8 @@ package org.apache.solr.common.cloud; * limitations under the License. */ +package org.apache.solr.common.cloud; + import org.noggit.JSONUtil; import org.noggit.JSONWriter; http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/67e64d2e/ranger_solrj/src/main/java/org/apache/solr/common/cloud/SolrZkClient.java ---------------------------------------------------------------------- diff --git a/ranger_solrj/src/main/java/org/apache/solr/common/cloud/SolrZkClient.java b/ranger_solrj/src/main/java/org/apache/solr/common/cloud/SolrZkClient.java index f14aedd..00da70b 100644 --- a/ranger_solrj/src/main/java/org/apache/solr/common/cloud/SolrZkClient.java +++ b/ranger_solrj/src/main/java/org/apache/solr/common/cloud/SolrZkClient.java @@ -1,5 +1,3 @@ -package org.apache.solr.common.cloud; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with this @@ -17,6 +15,8 @@ package org.apache.solr.common.cloud; * the License. */ +package org.apache.solr.common.cloud; + import org.apache.commons.io.FileUtils; import org.apache.solr.common.SolrException; import org.apache.solr.common.StringUtils; http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/67e64d2e/ranger_solrj/src/main/java/org/apache/solr/common/cloud/SolrZooKeeper.java ---------------------------------------------------------------------- diff --git a/ranger_solrj/src/main/java/org/apache/solr/common/cloud/SolrZooKeeper.java b/ranger_solrj/src/main/java/org/apache/solr/common/cloud/SolrZooKeeper.java index 35ad8bf..b83c692 100644 --- a/ranger_solrj/src/main/java/org/apache/solr/common/cloud/SolrZooKeeper.java +++ b/ranger_solrj/src/main/java/org/apache/solr/common/cloud/SolrZooKeeper.java @@ -1,5 +1,3 @@ -package org.apache.solr.common.cloud; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -17,6 +15,8 @@ package org.apache.solr.common.cloud; * limitations under the License. */ +package org.apache.solr.common.cloud; + import java.io.IOException; import java.lang.reflect.Field; import java.lang.reflect.InvocationTargetException; http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/67e64d2e/ranger_solrj/src/main/java/org/apache/solr/common/cloud/VMParamsAllAndReadonlyDigestZkACLProvider.java ---------------------------------------------------------------------- diff --git a/ranger_solrj/src/main/java/org/apache/solr/common/cloud/VMParamsAllAndReadonlyDigestZkACLProvider.java b/ranger_solrj/src/main/java/org/apache/solr/common/cloud/VMParamsAllAndReadonlyDigestZkACLProvider.java index 0b9ae1d..1c3c6ca 100644 --- a/ranger_solrj/src/main/java/org/apache/solr/common/cloud/VMParamsAllAndReadonlyDigestZkACLProvider.java +++ b/ranger_solrj/src/main/java/org/apache/solr/common/cloud/VMParamsAllAndReadonlyDigestZkACLProvider.java @@ -1,15 +1,3 @@ -package org.apache.solr.common.cloud; - -import java.security.NoSuchAlgorithmException; -import java.util.ArrayList; -import java.util.List; - -import org.apache.solr.common.StringUtils; -import org.apache.zookeeper.ZooDefs; -import org.apache.zookeeper.data.ACL; -import org.apache.zookeeper.data.Id; -import org.apache.zookeeper.server.auth.DigestAuthenticationProvider; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -27,6 +15,19 @@ import org.apache.zookeeper.server.auth.DigestAuthenticationProvider; * limitations under the License. */ +package org.apache.solr.common.cloud; + +import java.security.NoSuchAlgorithmException; +import java.util.ArrayList; +import java.util.List; + +import org.apache.solr.common.StringUtils; +import org.apache.zookeeper.ZooDefs; +import org.apache.zookeeper.data.ACL; +import org.apache.zookeeper.data.Id; +import org.apache.zookeeper.server.auth.DigestAuthenticationProvider; + + public class VMParamsAllAndReadonlyDigestZkACLProvider extends DefaultZkACLProvider { public static final String DEFAULT_DIGEST_READONLY_USERNAME_VM_PARAM_NAME = "zkDigestReadonlyUsername"; http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/67e64d2e/ranger_solrj/src/main/java/org/apache/solr/common/cloud/VMParamsSingleSetCredentialsDigestZkCredentialsProvider.java ---------------------------------------------------------------------- diff --git a/ranger_solrj/src/main/java/org/apache/solr/common/cloud/VMParamsSingleSetCredentialsDigestZkCredentialsProvider.java b/ranger_solrj/src/main/java/org/apache/solr/common/cloud/VMParamsSingleSetCredentialsDigestZkCredentialsProvider.java index 1e575fd..f71e2ec 100644 --- a/ranger_solrj/src/main/java/org/apache/solr/common/cloud/VMParamsSingleSetCredentialsDigestZkCredentialsProvider.java +++ b/ranger_solrj/src/main/java/org/apache/solr/common/cloud/VMParamsSingleSetCredentialsDigestZkCredentialsProvider.java @@ -1,12 +1,3 @@ -package org.apache.solr.common.cloud; - -import java.io.UnsupportedEncodingException; -import java.util.ArrayList; -import java.util.Collection; -import java.util.List; - -import org.apache.solr.common.StringUtils; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -24,6 +15,15 @@ import org.apache.solr.common.StringUtils; * limitations under the License. */ +package org.apache.solr.common.cloud; + +import java.io.UnsupportedEncodingException; +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; + +import org.apache.solr.common.StringUtils; + public class VMParamsSingleSetCredentialsDigestZkCredentialsProvider extends DefaultZkCredentialsProvider { public static final String DEFAULT_DIGEST_USERNAME_VM_PARAM_NAME = "zkDigestUsername"; http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/67e64d2e/ranger_solrj/src/main/java/org/apache/solr/common/cloud/ZkACLProvider.java ---------------------------------------------------------------------- diff --git a/ranger_solrj/src/main/java/org/apache/solr/common/cloud/ZkACLProvider.java b/ranger_solrj/src/main/java/org/apache/solr/common/cloud/ZkACLProvider.java index 03149b3..7cff190 100644 --- a/ranger_solrj/src/main/java/org/apache/solr/common/cloud/ZkACLProvider.java +++ b/ranger_solrj/src/main/java/org/apache/solr/common/cloud/ZkACLProvider.java @@ -1,9 +1,3 @@ -package org.apache.solr.common.cloud; - -import java.util.List; - -import org.apache.zookeeper.data.ACL; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -21,6 +15,12 @@ import org.apache.zookeeper.data.ACL; * limitations under the License. */ +package org.apache.solr.common.cloud; + +import java.util.List; + +import org.apache.zookeeper.data.ACL; + public interface ZkACLProvider { List<ACL> getACLsToAdd(String zNodePath); http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/67e64d2e/ranger_solrj/src/main/java/org/apache/solr/common/cloud/ZkClientConnectionStrategy.java ---------------------------------------------------------------------- diff --git a/ranger_solrj/src/main/java/org/apache/solr/common/cloud/ZkClientConnectionStrategy.java b/ranger_solrj/src/main/java/org/apache/solr/common/cloud/ZkClientConnectionStrategy.java index 5f4baa5..54c0e25 100644 --- a/ranger_solrj/src/main/java/org/apache/solr/common/cloud/ZkClientConnectionStrategy.java +++ b/ranger_solrj/src/main/java/org/apache/solr/common/cloud/ZkClientConnectionStrategy.java @@ -1,5 +1,3 @@ -package org.apache.solr.common.cloud; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with this @@ -17,6 +15,8 @@ package org.apache.solr.common.cloud; * the License. */ +package org.apache.solr.common.cloud; + import java.io.IOException; import java.util.ArrayList; import java.util.List; http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/67e64d2e/ranger_solrj/src/main/java/org/apache/solr/common/cloud/ZkCmdExecutor.java ---------------------------------------------------------------------- diff --git a/ranger_solrj/src/main/java/org/apache/solr/common/cloud/ZkCmdExecutor.java b/ranger_solrj/src/main/java/org/apache/solr/common/cloud/ZkCmdExecutor.java index d77ad06..c027cf2 100644 --- a/ranger_solrj/src/main/java/org/apache/solr/common/cloud/ZkCmdExecutor.java +++ b/ranger_solrj/src/main/java/org/apache/solr/common/cloud/ZkCmdExecutor.java @@ -1,5 +1,3 @@ -package org.apache.solr.common.cloud; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -17,6 +15,8 @@ package org.apache.solr.common.cloud; * limitations under the License. */ +package org.apache.solr.common.cloud; + import org.apache.zookeeper.CreateMode; import org.apache.zookeeper.KeeperException; import org.apache.zookeeper.KeeperException.NodeExistsException; http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/67e64d2e/ranger_solrj/src/main/java/org/apache/solr/common/cloud/ZkCoreNodeProps.java ---------------------------------------------------------------------- diff --git a/ranger_solrj/src/main/java/org/apache/solr/common/cloud/ZkCoreNodeProps.java b/ranger_solrj/src/main/java/org/apache/solr/common/cloud/ZkCoreNodeProps.java index 131d330..3031087 100644 --- a/ranger_solrj/src/main/java/org/apache/solr/common/cloud/ZkCoreNodeProps.java +++ b/ranger_solrj/src/main/java/org/apache/solr/common/cloud/ZkCoreNodeProps.java @@ -1,5 +1,3 @@ -package org.apache.solr.common.cloud; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with this @@ -17,6 +15,8 @@ package org.apache.solr.common.cloud; * the License. */ +package org.apache.solr.common.cloud; + public class ZkCoreNodeProps { private ZkNodeProps nodeProps; http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/67e64d2e/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 f385cda..012bf5d 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 @@ -1,7 +1,3 @@ -package org.apache.solr.common.cloud; - -import java.util.Collection; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -19,6 +15,10 @@ import java.util.Collection; * limitations under the License. */ +package org.apache.solr.common.cloud; + +import java.util.Collection; + public interface ZkCredentialsProvider { class ZkCredentials { http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/67e64d2e/ranger_solrj/src/main/java/org/apache/solr/common/cloud/ZkNodeProps.java ---------------------------------------------------------------------- diff --git a/ranger_solrj/src/main/java/org/apache/solr/common/cloud/ZkNodeProps.java b/ranger_solrj/src/main/java/org/apache/solr/common/cloud/ZkNodeProps.java index 5ddfa24..9adffd0 100644 --- a/ranger_solrj/src/main/java/org/apache/solr/common/cloud/ZkNodeProps.java +++ b/ranger_solrj/src/main/java/org/apache/solr/common/cloud/ZkNodeProps.java @@ -1,5 +1,3 @@ -package org.apache.solr.common.cloud; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -17,6 +15,8 @@ package org.apache.solr.common.cloud; * limitations under the License. */ +package org.apache.solr.common.cloud; + import org.noggit.JSONUtil; import org.noggit.JSONWriter; http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/67e64d2e/ranger_solrj/src/main/java/org/apache/solr/common/cloud/ZkStateReader.java ---------------------------------------------------------------------- diff --git a/ranger_solrj/src/main/java/org/apache/solr/common/cloud/ZkStateReader.java b/ranger_solrj/src/main/java/org/apache/solr/common/cloud/ZkStateReader.java index 1f9ebbc..457c7fa 100644 --- a/ranger_solrj/src/main/java/org/apache/solr/common/cloud/ZkStateReader.java +++ b/ranger_solrj/src/main/java/org/apache/solr/common/cloud/ZkStateReader.java @@ -1,5 +1,3 @@ -package org.apache.solr.common.cloud; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -17,6 +15,8 @@ package org.apache.solr.common.cloud; * limitations under the License. */ +package org.apache.solr.common.cloud; + import org.apache.solr.common.SolrException; import org.apache.solr.common.SolrException.ErrorCode; import org.apache.solr.common.util.ByteUtils; http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/67e64d2e/ranger_solrj/src/main/java/org/apache/solr/common/cloud/ZooKeeperException.java ---------------------------------------------------------------------- diff --git a/ranger_solrj/src/main/java/org/apache/solr/common/cloud/ZooKeeperException.java b/ranger_solrj/src/main/java/org/apache/solr/common/cloud/ZooKeeperException.java index c712dea..7c4761a 100644 --- a/ranger_solrj/src/main/java/org/apache/solr/common/cloud/ZooKeeperException.java +++ b/ranger_solrj/src/main/java/org/apache/solr/common/cloud/ZooKeeperException.java @@ -1,5 +1,3 @@ -package org.apache.solr.common.cloud; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -17,6 +15,7 @@ package org.apache.solr.common.cloud; * limitations under the License. */ +package org.apache.solr.common.cloud; import org.apache.solr.common.SolrException; http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/67e64d2e/ranger_solrj/src/main/java/org/apache/solr/common/luke/FieldFlag.java ---------------------------------------------------------------------- diff --git a/ranger_solrj/src/main/java/org/apache/solr/common/luke/FieldFlag.java b/ranger_solrj/src/main/java/org/apache/solr/common/luke/FieldFlag.java index 720c0b6..274e0b4 100644 --- a/ranger_solrj/src/main/java/org/apache/solr/common/luke/FieldFlag.java +++ b/ranger_solrj/src/main/java/org/apache/solr/common/luke/FieldFlag.java @@ -1,4 +1,3 @@ -package org.apache.solr.common.luke; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +15,7 @@ package org.apache.solr.common.luke; * limitations under the License. */ +package org.apache.solr.common.luke; /** * http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/67e64d2e/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 e776971..51c3fc5 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 @@ -1,4 +1,3 @@ -package org.apache.solr.common.params; /* * Licensed to the Apache Software Foundation (ASF) under one or more @@ -17,6 +16,8 @@ package org.apache.solr.common.params; * limitations under the License. */ +package org.apache.solr.common.params; + import java.util.Locale; public interface CollectionParams http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/67e64d2e/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 b99b9cf..e41911f 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 @@ -1,4 +1,3 @@ -package org.apache.solr.common.params; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +15,8 @@ package org.apache.solr.common.params; * limitations under the License. */ +package org.apache.solr.common.params; + /** * http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/67e64d2e/ranger_solrj/src/main/java/org/apache/solr/common/params/QueryElevationParams.java ---------------------------------------------------------------------- diff --git a/ranger_solrj/src/main/java/org/apache/solr/common/params/QueryElevationParams.java b/ranger_solrj/src/main/java/org/apache/solr/common/params/QueryElevationParams.java index d5a0b41..3271c38 100644 --- a/ranger_solrj/src/main/java/org/apache/solr/common/params/QueryElevationParams.java +++ b/ranger_solrj/src/main/java/org/apache/solr/common/params/QueryElevationParams.java @@ -1,5 +1,3 @@ -package org.apache.solr.common.params; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -17,6 +15,7 @@ package org.apache.solr.common.params; * limitations under the License. */ +package org.apache.solr.common.params; /** * Parameters used with the QueryElevationComponent http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/67e64d2e/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 55f8521..6788546 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 @@ -1,5 +1,3 @@ -package org.apache.solr.common.params; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -17,6 +15,8 @@ package org.apache.solr.common.params; * limitations under the License. */ +package org.apache.solr.common.params; + /** * Parameters used by the SimpleQParser. */ http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/67e64d2e/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 4194a3c..39f3dbe 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 @@ -1,4 +1,3 @@ -package org.apache.solr.common.params; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +15,8 @@ package org.apache.solr.common.params; * limitations under the License. */ +package org.apache.solr.common.params; + /** * http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/67e64d2e/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 5c81b5e..438bf5e 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 @@ -1,4 +1,3 @@ -package org.apache.solr.common.params; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +15,7 @@ package org.apache.solr.common.params; * limitations under the License. */ +package org.apache.solr.common.params; /** * http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/67e64d2e/ranger_solrj/src/main/java/org/apache/solr/common/util/DateUtil.java ---------------------------------------------------------------------- diff --git a/ranger_solrj/src/main/java/org/apache/solr/common/util/DateUtil.java b/ranger_solrj/src/main/java/org/apache/solr/common/util/DateUtil.java index 49b7fc4..6409dbc 100644 --- a/ranger_solrj/src/main/java/org/apache/solr/common/util/DateUtil.java +++ b/ranger_solrj/src/main/java/org/apache/solr/common/util/DateUtil.java @@ -1,4 +1,3 @@ -package org.apache.solr.common.util; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +15,8 @@ package org.apache.solr.common.util; * limitations under the License. */ +package org.apache.solr.common.util; + import java.io.IOException; import java.text.DateFormat; import java.text.ParseException; @@ -257,4 +258,4 @@ public class DateUtil { } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/67e64d2e/ranger_solrj/src/main/java/org/apache/solr/common/util/ExecutorUtil.java ---------------------------------------------------------------------- diff --git a/ranger_solrj/src/main/java/org/apache/solr/common/util/ExecutorUtil.java b/ranger_solrj/src/main/java/org/apache/solr/common/util/ExecutorUtil.java index 0c058c9..f17316c 100644 --- a/ranger_solrj/src/main/java/org/apache/solr/common/util/ExecutorUtil.java +++ b/ranger_solrj/src/main/java/org/apache/solr/common/util/ExecutorUtil.java @@ -1,5 +1,3 @@ -package org.apache.solr.common.util; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -17,6 +15,8 @@ package org.apache.solr.common.util; * limitations under the License. */ +package org.apache.solr.common.util; + import java.util.concurrent.ExecutorService; import java.util.concurrent.TimeUnit; http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/67e64d2e/ranger_solrj/src/main/java/org/apache/solr/common/util/Hash.java ---------------------------------------------------------------------- diff --git a/ranger_solrj/src/main/java/org/apache/solr/common/util/Hash.java b/ranger_solrj/src/main/java/org/apache/solr/common/util/Hash.java index 81b5232..f541fe1 100644 --- a/ranger_solrj/src/main/java/org/apache/solr/common/util/Hash.java +++ b/ranger_solrj/src/main/java/org/apache/solr/common/util/Hash.java @@ -1,5 +1,3 @@ -package org.apache.solr.common.util; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -17,6 +15,8 @@ package org.apache.solr.common.util; * limitations under the License. */ +package org.apache.solr.common.util; + /** * <p>Fast, well distributed, cross-platform hash functions. * </p> http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/67e64d2e/ranger_solrj/src/main/java/org/apache/solr/common/util/IOUtils.java ---------------------------------------------------------------------- diff --git a/ranger_solrj/src/main/java/org/apache/solr/common/util/IOUtils.java b/ranger_solrj/src/main/java/org/apache/solr/common/util/IOUtils.java index cbf1dcb..c9d7274 100644 --- a/ranger_solrj/src/main/java/org/apache/solr/common/util/IOUtils.java +++ b/ranger_solrj/src/main/java/org/apache/solr/common/util/IOUtils.java @@ -1,10 +1,3 @@ -package org.apache.solr.common.util; - -import java.io.Closeable; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -22,6 +15,13 @@ import org.slf4j.LoggerFactory; * limitations under the License. */ +package org.apache.solr.common.util; + +import java.io.Closeable; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + public class IOUtils { public static Logger LOG = LoggerFactory.getLogger(IOUtils.class); http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/67e64d2e/ranger_solrj/src/main/java/org/apache/solr/common/util/ObjectReleaseTracker.java ---------------------------------------------------------------------- diff --git a/ranger_solrj/src/main/java/org/apache/solr/common/util/ObjectReleaseTracker.java b/ranger_solrj/src/main/java/org/apache/solr/common/util/ObjectReleaseTracker.java index 47ab21a..8be12df 100644 --- a/ranger_solrj/src/main/java/org/apache/solr/common/util/ObjectReleaseTracker.java +++ b/ranger_solrj/src/main/java/org/apache/solr/common/util/ObjectReleaseTracker.java @@ -1,5 +1,3 @@ -package org.apache.solr.common.util; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -17,6 +15,8 @@ package org.apache.solr.common.util; * limitations under the License. */ +package org.apache.solr.common.util; + import java.io.PrintWriter; import java.io.StringWriter; import java.util.Map; http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/67e64d2e/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 097bd30..e3a0c5b 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 @@ -1,5 +1,3 @@ -package org.apache.solr.common.util; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -17,6 +15,8 @@ package org.apache.solr.common.util; * limitations under the License. */ +package org.apache.solr.common.util; + import java.util.concurrent.TimeUnit; public class RetryUtil { http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/67e64d2e/ranger_solrj/src/main/java/org/apache/solr/common/util/SimpleOrderedMap.java ---------------------------------------------------------------------- diff --git a/ranger_solrj/src/main/java/org/apache/solr/common/util/SimpleOrderedMap.java b/ranger_solrj/src/main/java/org/apache/solr/common/util/SimpleOrderedMap.java index c9996d1..1a217e7 100644 --- a/ranger_solrj/src/main/java/org/apache/solr/common/util/SimpleOrderedMap.java +++ b/ranger_solrj/src/main/java/org/apache/solr/common/util/SimpleOrderedMap.java @@ -1,5 +1,3 @@ -package org.apache.solr.common.util; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -17,6 +15,8 @@ package org.apache.solr.common.util; * limitations under the License. */ +package org.apache.solr.common.util; + import java.util.*; http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/67e64d2e/ranger_solrj/src/main/java/org/apache/solr/common/util/SolrjNamedThreadFactory.java ---------------------------------------------------------------------- diff --git a/ranger_solrj/src/main/java/org/apache/solr/common/util/SolrjNamedThreadFactory.java b/ranger_solrj/src/main/java/org/apache/solr/common/util/SolrjNamedThreadFactory.java index 2a7c901..46e462d 100644 --- a/ranger_solrj/src/main/java/org/apache/solr/common/util/SolrjNamedThreadFactory.java +++ b/ranger_solrj/src/main/java/org/apache/solr/common/util/SolrjNamedThreadFactory.java @@ -1,8 +1,3 @@ -package org.apache.solr.common.util; - -import java.util.concurrent.ThreadFactory; -import java.util.concurrent.atomic.AtomicInteger; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -20,6 +15,12 @@ import java.util.concurrent.atomic.AtomicInteger; * limitations under the License. */ +package org.apache.solr.common.util; + +import java.util.concurrent.ThreadFactory; +import java.util.concurrent.atomic.AtomicInteger; + + public class SolrjNamedThreadFactory implements ThreadFactory { private static final AtomicInteger poolNumber = new AtomicInteger(1); private final ThreadGroup group; @@ -47,4 +48,4 @@ public class SolrjNamedThreadFactory implements ThreadFactory { t.setPriority(Thread.NORM_PRIORITY); return t; } -} \ No newline at end of file +}
