You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by sa...@apache.org on 2016/07/13 17:21:12 UTC
[2/2] lucene-solr:branch_6x: LUCENE-7013: add licence header position
checker to -validate-source-patterns, and fix the violations it found
LUCENE-7013: add licence header position checker to -validate-source-patterns, and fix the violations it found
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/629346fe
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/629346fe
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/629346fe
Branch: refs/heads/branch_6x
Commit: 629346febb32f338f9c8c92fab7417b19a0a4037
Parents: 4339328
Author: Steve Rowe <sa...@apache.org>
Authored: Wed Jul 13 13:17:50 2016 -0400
Committer: Steve Rowe <sa...@apache.org>
Committed: Wed Jul 13 13:20:34 2016 -0400
----------------------------------------------------------------------
build.xml | 34 ++++++++++++++----
.../charfilter/HTMLStripCharFilter.java | 1 +
.../charfilter/HTMLStripCharFilter.jflex | 1 +
.../lucene/analysis/minhash/MinHashFilter.java | 5 +--
.../analysis/minhash/MinHashFilterFactory.java | 5 +--
.../analysis/standard/ASCIITLD.jflex-macro | 2 +-
.../analysis/standard/ClassicTokenizer.java | 1 +
.../standard/ClassicTokenizerImpl.jflex | 1 +
.../standard/UAX29URLEmailTokenizer.java | 1 +
.../standard/UAX29URLEmailTokenizerImpl.jflex | 1 +
.../lucene/analysis/util/UnicodeProps.java | 4 +--
.../wikipedia/WikipediaTokenizerImpl.java | 1 +
.../wikipedia/WikipediaTokenizerImpl.jflex | 1 +
.../analysis/minhash/MinHashFilterTest.java | 4 +--
.../tools/groovy/generate-unicode-data.groovy | 4 +--
.../analysis/standard/StandardTokenizer.java | 1 +
.../standard/StandardTokenizerImpl.jflex | 1 +
.../apache/lucene/index/MergeReaderWrapper.java | 4 +--
.../apache/lucene/index/SortingLeafReader.java | 4 +--
.../lucene/store/ByteArrayIndexInput.java | 4 +--
.../lucene62/TestLucene62SegmentInfoFormat.java | 4 +--
.../apache/lucene/index/TestIndexSorting.java | 4 +--
.../taxonomy/directory/TestAddTaxonomy.java | 4 +--
.../join/PointInSetIncludingScoreQuery.java | 34 +++++++++---------
.../store/HardlinkCopyDirectoryWrapper.java | 4 +--
.../store/TestHardLinkCopyDirectoryWrapper.java | 4 +--
.../apache/lucene/replicator/nrt/CopyJob.java | 4 +--
.../lucene/replicator/nrt/CopyOneFile.java | 4 +--
.../apache/lucene/replicator/nrt/CopyState.java | 4 +--
.../lucene/replicator/nrt/FileMetaData.java | 4 +--
.../org/apache/lucene/replicator/nrt/Node.java | 4 +--
.../nrt/NodeCommunicationException.java | 4 +--
.../nrt/PreCopyMergedSegmentWarmer.java | 4 +--
.../lucene/replicator/nrt/PrimaryNode.java | 4 +--
.../replicator/nrt/ReplicaFileDeleter.java | 4 +--
.../lucene/replicator/nrt/ReplicaNode.java | 4 +--
.../nrt/SegmentInfosSearcherManager.java | 4 +--
.../lucene/replicator/nrt/Connection.java | 4 +--
.../org/apache/lucene/replicator/nrt/Jobs.java | 4 +--
.../lucene/replicator/nrt/NodeProcess.java | 4 +--
.../lucene/replicator/nrt/SimpleCopyJob.java | 4 +--
.../replicator/nrt/SimplePrimaryNode.java | 4 +--
.../replicator/nrt/SimpleReplicaNode.java | 4 +--
.../lucene/replicator/nrt/SimpleServer.java | 4 +--
.../lucene/replicator/nrt/SimpleTransLog.java | 4 +--
.../replicator/nrt/TestNRTReplication.java | 4 +--
.../nrt/TestStressNRTReplication.java | 4 +--
.../lucene/replicator/nrt/ThreadPumper.java | 4 +--
.../geopoint/document/GeoPointTokenStream.java | 4 +--
.../lucene/spatial/util/TestGeoPointField.java | 4 +--
.../lucene/analysis/MockSynonymAnalyzer.java | 4 +--
.../lucene/analysis/MockSynonymFilter.java | 4 +--
.../org/apache/lucene/geo/EarthDebugger.java | 4 +--
.../apache/lucene/mockfile/VirusCheckingFS.java | 4 +--
.../lucene/mockfile/TestVirusCheckingFS.java | 4 +--
.../java/org/apache/solr/cloud/LockTree.java | 30 ++++++++--------
.../repository/BackupRepositoryFactory.java | 4 +--
.../backup/repository/HdfsBackupRepository.java | 4 +--
.../repository/LocalFileSystemRepository.java | 4 +--
.../org/apache/solr/handler/GraphHandler.java | 6 ++--
.../solr/response/GraphMLResponseWriter.java | 6 ++--
.../security/AutorizationEditOperation.java | 29 ++++++++--------
.../org/apache/solr/security/Permission.java | 35 +++++++++----------
.../solr/security/PermissionNameProvider.java | 4 +--
.../apache/solr/update/IndexFingerprint.java | 4 +--
.../ClassificationUpdateProcessor.java | 34 +++++++++---------
.../ClassificationUpdateProcessorFactory.java | 20 +++++------
.../solr/cloud/CreateCollectionCleanupTest.java | 4 +--
.../cloud/OverseerModifyCollectionTest.java | 34 +++++++++---------
.../apache/solr/cloud/SolrCLIZkUtilsTest.java | 34 +++++++++---------
.../org/apache/solr/cloud/TestLockTree.java | 34 +++++++++---------
.../cloud/TestOnReconnectListenerSupport.java | 4 +--
.../cloud/TestSizeLimitedDistributedMap.java | 4 +--
.../solr/cloud/rule/ImplicitSnitchTest.java | 36 ++++++++++----------
.../solr/core/BlobRepositoryCloudTest.java | 35 +++++++++----------
.../solr/core/BlobRepositoryMockingTest.java | 35 +++++++++----------
.../apache/solr/handler/BackupRestoreUtils.java | 4 +--
.../solr/handler/TestHdfsBackupRestoreCore.java | 6 ++--
.../component/ResourceSharingTestComponent.java | 34 +++++++++---------
.../apache/solr/request/TestFacetMethods.java | 4 +--
.../response/TestGraphMLResponseWriter.java | 4 +--
.../apache/solr/schema/BooleanFieldTest.java | 4 +--
.../solr/schema/TestManagedSchemaAPI.java | 34 +++++++++---------
.../search/TestGraphTermsQParserPlugin.java | 4 +--
...lassificationUpdateProcessorFactoryTest.java | 4 +--
.../solrj/io/graph/ShortestPathStream.java | 6 ++--
.../solrj/io/stream/ScoreNodesStream.java | 6 ++--
.../client/solrj/io/stream/TopicStream.java | 4 +--
.../solr/common/cloud/ClusterProperties.java | 4 +--
.../common/cloud/CollectionStatePredicate.java | 4 +--
.../common/cloud/CollectionStateWatcher.java | 6 ++--
.../solr/common/cloud/ZkMaintenanceUtils.java | 34 +++++++++---------
.../solrj/impl/CloudSolrClientBuilderTest.java | 18 +++++-----
.../ConcurrentUpdateSolrClientBuilderTest.java | 12 +++----
.../solrj/impl/HttpSolrClientBuilderTest.java | 22 ++++++------
.../solrj/impl/LBHttpSolrClientBuilderTest.java | 18 +++++-----
.../solrj/io/graph/GraphExpressionTest.java | 6 ++--
.../solr/client/solrj/io/graph/GraphTest.java | 4 +--
.../cloud/TestCollectionStateWatchers.java | 4 +--
99 files changed, 463 insertions(+), 433 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/629346fe/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index d0c9aa5..5cc7bd8 100644
--- a/build.xml
+++ b/build.xml
@@ -166,10 +166,17 @@
}
def javadocsPattern = ~$/(?sm)^\Q/**\E(.*?)\Q*/\E/$;
+ def commentPattern = ~$/(?sm)^\Q/*\E(.*?)\Q*/\E/$;
def lineSplitter = ~$/[\r\n]+/$;
def licenseMatcher = Defaults.createDefaultMatcher();
def validLoggerPattern = ~$/(?s)\b(private\s|static\s|final\s){3}+\s*Logger\s+\p{javaJavaIdentifierStart}+\s+=\s+\QLoggerFactory.getLogger(MethodHandles.lookup().lookupClass());\E/$;
+ def packagePattern = ~$/(?m)^\s*package\s+org\.apache.*;/$;
+ def isLicense = { matcher, ratDocument ->
+ licenseMatcher.reset();
+ return lineSplitter.split(matcher.group(1)).any{ licenseMatcher.match(ratDocument, it) };
+ }
+
ant.fileScanner{
fileset(dir: baseDir){
extensions.each{
@@ -197,17 +204,32 @@
}
}
def javadocsMatcher = javadocsPattern.matcher(text);
+ def ratDocument = new FileDocument(f);
while (javadocsMatcher.find()) {
- def ratDocument = new FileDocument(f);
- licenseMatcher.reset();
- if (lineSplitter.split(javadocsMatcher.group(1)).any{ licenseMatcher.match(ratDocument, it) }) {
+ if (isLicense(javadocsMatcher, ratDocument)) {
reportViolation(f, String.format(Locale.ENGLISH, 'javadoc-style license header [%s]',
ratDocument.getMetaData().value(MetaData.RAT_URL_LICENSE_FAMILY_NAME)));
}
}
- if (f.toString().endsWith('.java') && text.contains('org.slf4j.LoggerFactory')) {
- if (!validLoggerPattern.matcher(text).find()) {
- reportViolation(f, 'invalid logging pattern [not private static final, uses static class name]');
+ if (f.toString().endsWith('.java')) {
+ if (text.contains('org.slf4j.LoggerFactory')) {
+ if (!validLoggerPattern.matcher(text).find()) {
+ reportViolation(f, 'invalid logging pattern [not private static final, uses static class name]');
+ }
+ }
+ def packageMatcher = packagePattern.matcher(text);
+ if (packageMatcher.find()) {
+ def packageStartPos = packageMatcher.start();
+ def commentMatcher = commentPattern.matcher(text);
+ while (commentMatcher.find()) {
+ if (isLicense(commentMatcher, ratDocument)) {
+ if (commentMatcher.start() < packageStartPos) {
+ break; // This file is all good, so break loop: license header precedes package definition
+ } else {
+ reportViolation(f, 'package declaration precedes license header');
+ }
+ }
+ }
}
}
};
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/629346fe/lucene/analysis/common/src/java/org/apache/lucene/analysis/charfilter/HTMLStripCharFilter.java
----------------------------------------------------------------------
diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/charfilter/HTMLStripCharFilter.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/charfilter/HTMLStripCharFilter.java
index 68a939b..ba44dd8 100644
--- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/charfilter/HTMLStripCharFilter.java
+++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/charfilter/HTMLStripCharFilter.java
@@ -16,6 +16,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
package org.apache.lucene.analysis.charfilter;
import java.io.IOException;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/629346fe/lucene/analysis/common/src/java/org/apache/lucene/analysis/charfilter/HTMLStripCharFilter.jflex
----------------------------------------------------------------------
diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/charfilter/HTMLStripCharFilter.jflex b/lucene/analysis/common/src/java/org/apache/lucene/analysis/charfilter/HTMLStripCharFilter.jflex
index 352ede7..98c3946 100644
--- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/charfilter/HTMLStripCharFilter.jflex
+++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/charfilter/HTMLStripCharFilter.jflex
@@ -14,6 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
package org.apache.lucene.analysis.charfilter;
import java.io.IOException;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/629346fe/lucene/analysis/common/src/java/org/apache/lucene/analysis/minhash/MinHashFilter.java
----------------------------------------------------------------------
diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/minhash/MinHashFilter.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/minhash/MinHashFilter.java
index 60df1c0..1a1a637 100644
--- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/minhash/MinHashFilter.java
+++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/minhash/MinHashFilter.java
@@ -1,5 +1,3 @@
-package org.apache.lucene.analysis.minhash;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
@@ -16,6 +14,9 @@ package org.apache.lucene.analysis.minhash;
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
+package org.apache.lucene.analysis.minhash;
+
import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/629346fe/lucene/analysis/common/src/java/org/apache/lucene/analysis/minhash/MinHashFilterFactory.java
----------------------------------------------------------------------
diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/minhash/MinHashFilterFactory.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/minhash/MinHashFilterFactory.java
index d951b9b..c4c827b 100644
--- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/minhash/MinHashFilterFactory.java
+++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/minhash/MinHashFilterFactory.java
@@ -1,5 +1,3 @@
-package org.apache.lucene.analysis.minhash;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
@@ -16,6 +14,9 @@ package org.apache.lucene.analysis.minhash;
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
+package org.apache.lucene.analysis.minhash;
+
import java.util.Map;
import org.apache.lucene.analysis.TokenStream;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/629346fe/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/ASCIITLD.jflex-macro
----------------------------------------------------------------------
diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/ASCIITLD.jflex-macro b/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/ASCIITLD.jflex-macro
index 5d78558..ec336f2 100644
--- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/ASCIITLD.jflex-macro
+++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/ASCIITLD.jflex-macro
@@ -14,6 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
// Generated from IANA Root Zone Database <http://www.internic.net/zones/root.zone>
// file version from Friday, December 6, 2013 4:34:10 AM UTC
// generated on Friday, December 6, 2013 3:21:59 PM UTC
@@ -363,4 +364,3 @@ ASCIITLD = "." (
| [zZ][mM]
| [zZ][wW]
) "."? // Accept trailing root (empty) domain
-
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/629346fe/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/ClassicTokenizer.java
----------------------------------------------------------------------
diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/ClassicTokenizer.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/ClassicTokenizer.java
index 76b1ef6..339ab8b 100644
--- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/ClassicTokenizer.java
+++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/ClassicTokenizer.java
@@ -14,6 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
package org.apache.lucene.analysis.standard;
import java.io.IOException;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/629346fe/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/ClassicTokenizerImpl.jflex
----------------------------------------------------------------------
diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/ClassicTokenizerImpl.jflex b/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/ClassicTokenizerImpl.jflex
index de65d26..4d6ad16 100644
--- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/ClassicTokenizerImpl.jflex
+++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/ClassicTokenizerImpl.jflex
@@ -14,6 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
package org.apache.lucene.analysis.standard;
import java.io.Reader;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/629346fe/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/UAX29URLEmailTokenizer.java
----------------------------------------------------------------------
diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/UAX29URLEmailTokenizer.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/UAX29URLEmailTokenizer.java
index 03de032..d2b02e4 100644
--- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/UAX29URLEmailTokenizer.java
+++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/UAX29URLEmailTokenizer.java
@@ -14,6 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
package org.apache.lucene.analysis.standard;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/629346fe/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/UAX29URLEmailTokenizerImpl.jflex
----------------------------------------------------------------------
diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/UAX29URLEmailTokenizerImpl.jflex b/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/UAX29URLEmailTokenizerImpl.jflex
index 32af631..73a471e 100644
--- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/UAX29URLEmailTokenizerImpl.jflex
+++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/UAX29URLEmailTokenizerImpl.jflex
@@ -14,6 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
package org.apache.lucene.analysis.standard;
import org.apache.lucene.analysis.tokenattributes.CharTermAttribute;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/629346fe/lucene/analysis/common/src/java/org/apache/lucene/analysis/util/UnicodeProps.java
----------------------------------------------------------------------
diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/util/UnicodeProps.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/util/UnicodeProps.java
index e1537ae..75070d1 100644
--- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/util/UnicodeProps.java
+++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/util/UnicodeProps.java
@@ -1,7 +1,5 @@
// DO NOT EDIT THIS FILE! Use "ant unicode-data" to recreate.
-package org.apache.lucene.analysis.util;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
@@ -19,6 +17,8 @@ package org.apache.lucene.analysis.util;
* limitations under the License.
*/
+package org.apache.lucene.analysis.util;
+
import org.apache.lucene.util.Bits;
import org.apache.lucene.util.SparseFixedBitSet;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/629346fe/lucene/analysis/common/src/java/org/apache/lucene/analysis/wikipedia/WikipediaTokenizerImpl.java
----------------------------------------------------------------------
diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/wikipedia/WikipediaTokenizerImpl.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/wikipedia/WikipediaTokenizerImpl.java
index 337a562..7f9227f 100644
--- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/wikipedia/WikipediaTokenizerImpl.java
+++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/wikipedia/WikipediaTokenizerImpl.java
@@ -16,6 +16,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
package org.apache.lucene.analysis.wikipedia;
import org.apache.lucene.analysis.tokenattributes.CharTermAttribute;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/629346fe/lucene/analysis/common/src/java/org/apache/lucene/analysis/wikipedia/WikipediaTokenizerImpl.jflex
----------------------------------------------------------------------
diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/wikipedia/WikipediaTokenizerImpl.jflex b/lucene/analysis/common/src/java/org/apache/lucene/analysis/wikipedia/WikipediaTokenizerImpl.jflex
index 404fbd6..3ac31e4 100644
--- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/wikipedia/WikipediaTokenizerImpl.jflex
+++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/wikipedia/WikipediaTokenizerImpl.jflex
@@ -14,6 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
package org.apache.lucene.analysis.wikipedia;
import org.apache.lucene.analysis.tokenattributes.CharTermAttribute;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/629346fe/lucene/analysis/common/src/test/org/apache/lucene/analysis/minhash/MinHashFilterTest.java
----------------------------------------------------------------------
diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/minhash/MinHashFilterTest.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/minhash/MinHashFilterTest.java
index 7c02d3b..a4080fe 100644
--- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/minhash/MinHashFilterTest.java
+++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/minhash/MinHashFilterTest.java
@@ -1,5 +1,3 @@
-package org.apache.lucene.analysis.minhash;
-
/*
* 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.lucene.analysis.minhash;
* limitations under the License.
*/
+package org.apache.lucene.analysis.minhash;
+
import java.io.IOException;
import java.io.StringReader;
import java.io.UnsupportedEncodingException;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/629346fe/lucene/analysis/common/src/tools/groovy/generate-unicode-data.groovy
----------------------------------------------------------------------
diff --git a/lucene/analysis/common/src/tools/groovy/generate-unicode-data.groovy b/lucene/analysis/common/src/tools/groovy/generate-unicode-data.groovy
index 3ea2b9e..37857e0 100644
--- a/lucene/analysis/common/src/tools/groovy/generate-unicode-data.groovy
+++ b/lucene/analysis/common/src/tools/groovy/generate-unicode-data.groovy
@@ -44,8 +44,6 @@ def unicodeVersion = UCharacter.getUnicodeVersion().toString();
def code = """
// DO NOT EDIT THIS FILE! Use "ant unicode-data" to recreate.
-package org.apache.lucene.analysis.util;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
@@ -63,6 +61,8 @@ package org.apache.lucene.analysis.util;
* limitations under the License.
*/
+package org.apache.lucene.analysis.util;
+
import org.apache.lucene.util.Bits;
import org.apache.lucene.util.SparseFixedBitSet;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/629346fe/lucene/core/src/java/org/apache/lucene/analysis/standard/StandardTokenizer.java
----------------------------------------------------------------------
diff --git a/lucene/core/src/java/org/apache/lucene/analysis/standard/StandardTokenizer.java b/lucene/core/src/java/org/apache/lucene/analysis/standard/StandardTokenizer.java
index 5c5169a..5b8fc75 100644
--- a/lucene/core/src/java/org/apache/lucene/analysis/standard/StandardTokenizer.java
+++ b/lucene/core/src/java/org/apache/lucene/analysis/standard/StandardTokenizer.java
@@ -14,6 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
package org.apache.lucene.analysis.standard;
import java.io.IOException;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/629346fe/lucene/core/src/java/org/apache/lucene/analysis/standard/StandardTokenizerImpl.jflex
----------------------------------------------------------------------
diff --git a/lucene/core/src/java/org/apache/lucene/analysis/standard/StandardTokenizerImpl.jflex b/lucene/core/src/java/org/apache/lucene/analysis/standard/StandardTokenizerImpl.jflex
index 24c401d..11b2cbd 100644
--- a/lucene/core/src/java/org/apache/lucene/analysis/standard/StandardTokenizerImpl.jflex
+++ b/lucene/core/src/java/org/apache/lucene/analysis/standard/StandardTokenizerImpl.jflex
@@ -14,6 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
package org.apache.lucene.analysis.standard;
import org.apache.lucene.analysis.tokenattributes.CharTermAttribute;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/629346fe/lucene/core/src/java/org/apache/lucene/index/MergeReaderWrapper.java
----------------------------------------------------------------------
diff --git a/lucene/core/src/java/org/apache/lucene/index/MergeReaderWrapper.java b/lucene/core/src/java/org/apache/lucene/index/MergeReaderWrapper.java
index 2401d0f..bcecf2f 100644
--- a/lucene/core/src/java/org/apache/lucene/index/MergeReaderWrapper.java
+++ b/lucene/core/src/java/org/apache/lucene/index/MergeReaderWrapper.java
@@ -1,5 +1,3 @@
-package org.apache.lucene.index;
-
/*
* 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.lucene.index;
* limitations under the License.
*/
+package org.apache.lucene.index;
+
import java.io.IOException;
import org.apache.lucene.codecs.DocValuesProducer;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/629346fe/lucene/core/src/java/org/apache/lucene/index/SortingLeafReader.java
----------------------------------------------------------------------
diff --git a/lucene/core/src/java/org/apache/lucene/index/SortingLeafReader.java b/lucene/core/src/java/org/apache/lucene/index/SortingLeafReader.java
index 70d5d20..c1476d0 100644
--- a/lucene/core/src/java/org/apache/lucene/index/SortingLeafReader.java
+++ b/lucene/core/src/java/org/apache/lucene/index/SortingLeafReader.java
@@ -1,5 +1,3 @@
-package org.apache.lucene.index;
-
/*
* 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.lucene.index;
* limitations under the License.
*/
+package org.apache.lucene.index;
+
import java.io.IOException;
import java.util.Arrays;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/629346fe/lucene/core/src/java/org/apache/lucene/store/ByteArrayIndexInput.java
----------------------------------------------------------------------
diff --git a/lucene/core/src/java/org/apache/lucene/store/ByteArrayIndexInput.java b/lucene/core/src/java/org/apache/lucene/store/ByteArrayIndexInput.java
index 80f5647..6ad6125 100644
--- a/lucene/core/src/java/org/apache/lucene/store/ByteArrayIndexInput.java
+++ b/lucene/core/src/java/org/apache/lucene/store/ByteArrayIndexInput.java
@@ -1,5 +1,3 @@
-package org.apache.lucene.store;
-
/*
* 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.lucene.store;
* limitations under the License.
*/
+package org.apache.lucene.store;
+
import java.io.IOException;
/**
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/629346fe/lucene/core/src/test/org/apache/lucene/codecs/lucene62/TestLucene62SegmentInfoFormat.java
----------------------------------------------------------------------
diff --git a/lucene/core/src/test/org/apache/lucene/codecs/lucene62/TestLucene62SegmentInfoFormat.java b/lucene/core/src/test/org/apache/lucene/codecs/lucene62/TestLucene62SegmentInfoFormat.java
index 8c758f2..54110f7 100644
--- a/lucene/core/src/test/org/apache/lucene/codecs/lucene62/TestLucene62SegmentInfoFormat.java
+++ b/lucene/core/src/test/org/apache/lucene/codecs/lucene62/TestLucene62SegmentInfoFormat.java
@@ -1,5 +1,3 @@
-package org.apache.lucene.codecs.lucene62;
-
/*
* 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.lucene.codecs.lucene62;
* limitations under the License.
*/
+package org.apache.lucene.codecs.lucene62;
+
import org.apache.lucene.codecs.Codec;
import org.apache.lucene.index.BaseSegmentInfoFormatTestCase;
import org.apache.lucene.util.TestUtil;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/629346fe/lucene/core/src/test/org/apache/lucene/index/TestIndexSorting.java
----------------------------------------------------------------------
diff --git a/lucene/core/src/test/org/apache/lucene/index/TestIndexSorting.java b/lucene/core/src/test/org/apache/lucene/index/TestIndexSorting.java
index b91bb9b..96e53ab 100644
--- a/lucene/core/src/test/org/apache/lucene/index/TestIndexSorting.java
+++ b/lucene/core/src/test/org/apache/lucene/index/TestIndexSorting.java
@@ -1,5 +1,3 @@
-package org.apache.lucene.index;
-
/*
* 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.lucene.index;
* limitations under the License.
*/
+package org.apache.lucene.index;
+
import java.io.IOException;
import java.util.ArrayList;
import java.util.Collections;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/629346fe/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/directory/TestAddTaxonomy.java
----------------------------------------------------------------------
diff --git a/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/directory/TestAddTaxonomy.java b/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/directory/TestAddTaxonomy.java
index a860ec9..232ccee 100644
--- a/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/directory/TestAddTaxonomy.java
+++ b/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/directory/TestAddTaxonomy.java
@@ -1,5 +1,3 @@
-package org.apache.lucene.facet.taxonomy.directory;
-
/*
* 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.lucene.facet.taxonomy.directory;
* limitations under the License.
*/
+package org.apache.lucene.facet.taxonomy.directory;
+
import java.io.IOException;
import java.util.HashSet;
import java.util.Random;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/629346fe/lucene/join/src/java/org/apache/lucene/search/join/PointInSetIncludingScoreQuery.java
----------------------------------------------------------------------
diff --git a/lucene/join/src/java/org/apache/lucene/search/join/PointInSetIncludingScoreQuery.java b/lucene/join/src/java/org/apache/lucene/search/join/PointInSetIncludingScoreQuery.java
index d83bc8f..f80f1ae 100644
--- a/lucene/join/src/java/org/apache/lucene/search/join/PointInSetIncludingScoreQuery.java
+++ b/lucene/join/src/java/org/apache/lucene/search/join/PointInSetIncludingScoreQuery.java
@@ -1,3 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package org.apache.lucene.search.join;
import java.io.IOException;
@@ -32,23 +49,6 @@ import org.apache.lucene.util.BytesRef;
import org.apache.lucene.util.BytesRefBuilder;
import org.apache.lucene.util.FixedBitSet;
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
// A TermsIncludingScoreQuery variant for point values:
abstract class PointInSetIncludingScoreQuery extends Query {
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/629346fe/lucene/misc/src/java/org/apache/lucene/store/HardlinkCopyDirectoryWrapper.java
----------------------------------------------------------------------
diff --git a/lucene/misc/src/java/org/apache/lucene/store/HardlinkCopyDirectoryWrapper.java b/lucene/misc/src/java/org/apache/lucene/store/HardlinkCopyDirectoryWrapper.java
index 374178e..c7b164a 100644
--- a/lucene/misc/src/java/org/apache/lucene/store/HardlinkCopyDirectoryWrapper.java
+++ b/lucene/misc/src/java/org/apache/lucene/store/HardlinkCopyDirectoryWrapper.java
@@ -1,5 +1,3 @@
-package org.apache.lucene.store;
-
/*
* 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.lucene.store;
* limitations under the License.
*/
+package org.apache.lucene.store;
+
import java.io.FileNotFoundException;
import java.io.IOException;
import java.nio.file.FileAlreadyExistsException;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/629346fe/lucene/misc/src/test/org/apache/lucene/store/TestHardLinkCopyDirectoryWrapper.java
----------------------------------------------------------------------
diff --git a/lucene/misc/src/test/org/apache/lucene/store/TestHardLinkCopyDirectoryWrapper.java b/lucene/misc/src/test/org/apache/lucene/store/TestHardLinkCopyDirectoryWrapper.java
index 953dc59..4a88dd4 100644
--- a/lucene/misc/src/test/org/apache/lucene/store/TestHardLinkCopyDirectoryWrapper.java
+++ b/lucene/misc/src/test/org/apache/lucene/store/TestHardLinkCopyDirectoryWrapper.java
@@ -1,5 +1,3 @@
-package org.apache.lucene.store;
-
/*
* 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.lucene.store;
* limitations under the License.
*/
+package org.apache.lucene.store;
+
import java.io.IOException;
import java.nio.file.Files;
import java.nio.file.Path;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/629346fe/lucene/replicator/src/java/org/apache/lucene/replicator/nrt/CopyJob.java
----------------------------------------------------------------------
diff --git a/lucene/replicator/src/java/org/apache/lucene/replicator/nrt/CopyJob.java b/lucene/replicator/src/java/org/apache/lucene/replicator/nrt/CopyJob.java
index 1e63d1f..2bdcf1d 100644
--- a/lucene/replicator/src/java/org/apache/lucene/replicator/nrt/CopyJob.java
+++ b/lucene/replicator/src/java/org/apache/lucene/replicator/nrt/CopyJob.java
@@ -1,5 +1,3 @@
-package org.apache.lucene.replicator.nrt;
-
/*
* 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.lucene.replicator.nrt;
* limitations under the License.
*/
+package org.apache.lucene.replicator.nrt;
+
import java.io.IOException;
import java.util.Iterator;
import java.util.List;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/629346fe/lucene/replicator/src/java/org/apache/lucene/replicator/nrt/CopyOneFile.java
----------------------------------------------------------------------
diff --git a/lucene/replicator/src/java/org/apache/lucene/replicator/nrt/CopyOneFile.java b/lucene/replicator/src/java/org/apache/lucene/replicator/nrt/CopyOneFile.java
index ab71e05..dd9f16c 100644
--- a/lucene/replicator/src/java/org/apache/lucene/replicator/nrt/CopyOneFile.java
+++ b/lucene/replicator/src/java/org/apache/lucene/replicator/nrt/CopyOneFile.java
@@ -1,5 +1,3 @@
-package org.apache.lucene.replicator.nrt;
-
/*
* 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.lucene.replicator.nrt;
* limitations under the License.
*/
+package org.apache.lucene.replicator.nrt;
+
import java.io.Closeable;
import java.io.IOException;
import java.util.Locale;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/629346fe/lucene/replicator/src/java/org/apache/lucene/replicator/nrt/CopyState.java
----------------------------------------------------------------------
diff --git a/lucene/replicator/src/java/org/apache/lucene/replicator/nrt/CopyState.java b/lucene/replicator/src/java/org/apache/lucene/replicator/nrt/CopyState.java
index c5ddda0..aff45c0 100644
--- a/lucene/replicator/src/java/org/apache/lucene/replicator/nrt/CopyState.java
+++ b/lucene/replicator/src/java/org/apache/lucene/replicator/nrt/CopyState.java
@@ -1,5 +1,3 @@
-package org.apache.lucene.replicator.nrt;
-
/*
* 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.lucene.replicator.nrt;
* limitations under the License.
*/
+package org.apache.lucene.replicator.nrt;
+
import java.util.Collections;
import java.util.Map;
import java.util.Set;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/629346fe/lucene/replicator/src/java/org/apache/lucene/replicator/nrt/FileMetaData.java
----------------------------------------------------------------------
diff --git a/lucene/replicator/src/java/org/apache/lucene/replicator/nrt/FileMetaData.java b/lucene/replicator/src/java/org/apache/lucene/replicator/nrt/FileMetaData.java
index 897d5ca..ac3e1f0 100644
--- a/lucene/replicator/src/java/org/apache/lucene/replicator/nrt/FileMetaData.java
+++ b/lucene/replicator/src/java/org/apache/lucene/replicator/nrt/FileMetaData.java
@@ -1,5 +1,3 @@
-package org.apache.lucene.replicator.nrt;
-
/*
* 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.lucene.replicator.nrt;
* limitations under the License.
*/
+package org.apache.lucene.replicator.nrt;
+
/** Holds metadata details about a single file that we use to confirm two files (one remote, one local) are in fact "identical".
*
* @lucene.experimental */
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/629346fe/lucene/replicator/src/java/org/apache/lucene/replicator/nrt/Node.java
----------------------------------------------------------------------
diff --git a/lucene/replicator/src/java/org/apache/lucene/replicator/nrt/Node.java b/lucene/replicator/src/java/org/apache/lucene/replicator/nrt/Node.java
index 85da89c..759497a 100644
--- a/lucene/replicator/src/java/org/apache/lucene/replicator/nrt/Node.java
+++ b/lucene/replicator/src/java/org/apache/lucene/replicator/nrt/Node.java
@@ -1,5 +1,3 @@
-package org.apache.lucene.replicator.nrt;
-
/*
* 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.lucene.replicator.nrt;
* limitations under the License.
*/
+package org.apache.lucene.replicator.nrt;
+
import java.io.Closeable;
import java.io.EOFException;
import java.io.FileNotFoundException;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/629346fe/lucene/replicator/src/java/org/apache/lucene/replicator/nrt/NodeCommunicationException.java
----------------------------------------------------------------------
diff --git a/lucene/replicator/src/java/org/apache/lucene/replicator/nrt/NodeCommunicationException.java b/lucene/replicator/src/java/org/apache/lucene/replicator/nrt/NodeCommunicationException.java
index d286f3d..cbbb65c 100644
--- a/lucene/replicator/src/java/org/apache/lucene/replicator/nrt/NodeCommunicationException.java
+++ b/lucene/replicator/src/java/org/apache/lucene/replicator/nrt/NodeCommunicationException.java
@@ -1,5 +1,3 @@
-package org.apache.lucene.replicator.nrt;
-
/*
* 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.lucene.replicator.nrt;
* limitations under the License.
*/
+package org.apache.lucene.replicator.nrt;
+
/**
* Should be thrown by subclasses of {@link PrimaryNode} and {@link ReplicaNode} if a non-fatal exception
* occurred while communicating between nodes.
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/629346fe/lucene/replicator/src/java/org/apache/lucene/replicator/nrt/PreCopyMergedSegmentWarmer.java
----------------------------------------------------------------------
diff --git a/lucene/replicator/src/java/org/apache/lucene/replicator/nrt/PreCopyMergedSegmentWarmer.java b/lucene/replicator/src/java/org/apache/lucene/replicator/nrt/PreCopyMergedSegmentWarmer.java
index 77f23ab..0b33f17 100644
--- a/lucene/replicator/src/java/org/apache/lucene/replicator/nrt/PreCopyMergedSegmentWarmer.java
+++ b/lucene/replicator/src/java/org/apache/lucene/replicator/nrt/PreCopyMergedSegmentWarmer.java
@@ -1,5 +1,3 @@
-package org.apache.lucene.replicator.nrt;
-
/*
* 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.lucene.replicator.nrt;
* limitations under the License.
*/
+package org.apache.lucene.replicator.nrt;
+
/** A merged segment warmer that pre-copies the merged segment out to
* replicas before primary cuts over to the merged segment. This
* ensures that NRT reopen time on replicas is only in proportion to
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/629346fe/lucene/replicator/src/java/org/apache/lucene/replicator/nrt/PrimaryNode.java
----------------------------------------------------------------------
diff --git a/lucene/replicator/src/java/org/apache/lucene/replicator/nrt/PrimaryNode.java b/lucene/replicator/src/java/org/apache/lucene/replicator/nrt/PrimaryNode.java
index 749f54e..1d04d08 100644
--- a/lucene/replicator/src/java/org/apache/lucene/replicator/nrt/PrimaryNode.java
+++ b/lucene/replicator/src/java/org/apache/lucene/replicator/nrt/PrimaryNode.java
@@ -1,5 +1,3 @@
-package org.apache.lucene.replicator.nrt;
-
/*
* 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.lucene.replicator.nrt;
* limitations under the License.
*/
+package org.apache.lucene.replicator.nrt;
+
import java.io.IOException;
import java.io.PrintStream;
import java.util.Collections;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/629346fe/lucene/replicator/src/java/org/apache/lucene/replicator/nrt/ReplicaFileDeleter.java
----------------------------------------------------------------------
diff --git a/lucene/replicator/src/java/org/apache/lucene/replicator/nrt/ReplicaFileDeleter.java b/lucene/replicator/src/java/org/apache/lucene/replicator/nrt/ReplicaFileDeleter.java
index 1638c29..86dbc52 100644
--- a/lucene/replicator/src/java/org/apache/lucene/replicator/nrt/ReplicaFileDeleter.java
+++ b/lucene/replicator/src/java/org/apache/lucene/replicator/nrt/ReplicaFileDeleter.java
@@ -1,5 +1,3 @@
-package org.apache.lucene.replicator.nrt;
-
/*
* 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.lucene.replicator.nrt;
* limitations under the License.
*/
+package org.apache.lucene.replicator.nrt;
+
import java.io.FileNotFoundException;
import java.io.IOException;
import java.nio.file.NoSuchFileException;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/629346fe/lucene/replicator/src/java/org/apache/lucene/replicator/nrt/ReplicaNode.java
----------------------------------------------------------------------
diff --git a/lucene/replicator/src/java/org/apache/lucene/replicator/nrt/ReplicaNode.java b/lucene/replicator/src/java/org/apache/lucene/replicator/nrt/ReplicaNode.java
index 1ca1519..ce9c3ce 100644
--- a/lucene/replicator/src/java/org/apache/lucene/replicator/nrt/ReplicaNode.java
+++ b/lucene/replicator/src/java/org/apache/lucene/replicator/nrt/ReplicaNode.java
@@ -1,5 +1,3 @@
-package org.apache.lucene.replicator.nrt;
-
/*
* 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.lucene.replicator.nrt;
* limitations under the License.
*/
+package org.apache.lucene.replicator.nrt;
+
import java.io.IOException;
import java.io.PrintStream;
import java.util.ArrayList;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/629346fe/lucene/replicator/src/java/org/apache/lucene/replicator/nrt/SegmentInfosSearcherManager.java
----------------------------------------------------------------------
diff --git a/lucene/replicator/src/java/org/apache/lucene/replicator/nrt/SegmentInfosSearcherManager.java b/lucene/replicator/src/java/org/apache/lucene/replicator/nrt/SegmentInfosSearcherManager.java
index 4fda0fa..4cb49c4 100644
--- a/lucene/replicator/src/java/org/apache/lucene/replicator/nrt/SegmentInfosSearcherManager.java
+++ b/lucene/replicator/src/java/org/apache/lucene/replicator/nrt/SegmentInfosSearcherManager.java
@@ -1,5 +1,3 @@
-package org.apache.lucene.replicator.nrt;
-
/*
* 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.lucene.replicator.nrt;
* limitations under the License.
*/
+package org.apache.lucene.replicator.nrt;
+
import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/629346fe/lucene/replicator/src/test/org/apache/lucene/replicator/nrt/Connection.java
----------------------------------------------------------------------
diff --git a/lucene/replicator/src/test/org/apache/lucene/replicator/nrt/Connection.java b/lucene/replicator/src/test/org/apache/lucene/replicator/nrt/Connection.java
index 87fce57..8d671ba 100644
--- a/lucene/replicator/src/test/org/apache/lucene/replicator/nrt/Connection.java
+++ b/lucene/replicator/src/test/org/apache/lucene/replicator/nrt/Connection.java
@@ -1,5 +1,3 @@
-package org.apache.lucene.replicator.nrt;
-
/*
* 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.lucene.replicator.nrt;
* limitations under the License.
*/
+package org.apache.lucene.replicator.nrt;
+
import java.io.BufferedOutputStream;
import java.io.Closeable;
import java.io.IOException;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/629346fe/lucene/replicator/src/test/org/apache/lucene/replicator/nrt/Jobs.java
----------------------------------------------------------------------
diff --git a/lucene/replicator/src/test/org/apache/lucene/replicator/nrt/Jobs.java b/lucene/replicator/src/test/org/apache/lucene/replicator/nrt/Jobs.java
index 6968fdb..87feb33 100644
--- a/lucene/replicator/src/test/org/apache/lucene/replicator/nrt/Jobs.java
+++ b/lucene/replicator/src/test/org/apache/lucene/replicator/nrt/Jobs.java
@@ -1,5 +1,3 @@
-package org.apache.lucene.replicator.nrt;
-
/*
* 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.lucene.replicator.nrt;
* limitations under the License.
*/
+package org.apache.lucene.replicator.nrt;
+
import java.io.Closeable;
import java.io.IOException;
import java.util.PriorityQueue;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/629346fe/lucene/replicator/src/test/org/apache/lucene/replicator/nrt/NodeProcess.java
----------------------------------------------------------------------
diff --git a/lucene/replicator/src/test/org/apache/lucene/replicator/nrt/NodeProcess.java b/lucene/replicator/src/test/org/apache/lucene/replicator/nrt/NodeProcess.java
index a0bfb78..daeffc7 100644
--- a/lucene/replicator/src/test/org/apache/lucene/replicator/nrt/NodeProcess.java
+++ b/lucene/replicator/src/test/org/apache/lucene/replicator/nrt/NodeProcess.java
@@ -1,5 +1,3 @@
-package org.apache.lucene.replicator.nrt;
-
/*
* 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.lucene.replicator.nrt;
* limitations under the License.
*/
+package org.apache.lucene.replicator.nrt;
+
import java.io.Closeable;
import java.io.IOException;
import java.util.concurrent.atomic.AtomicBoolean;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/629346fe/lucene/replicator/src/test/org/apache/lucene/replicator/nrt/SimpleCopyJob.java
----------------------------------------------------------------------
diff --git a/lucene/replicator/src/test/org/apache/lucene/replicator/nrt/SimpleCopyJob.java b/lucene/replicator/src/test/org/apache/lucene/replicator/nrt/SimpleCopyJob.java
index 6793df8..ba72ae4 100644
--- a/lucene/replicator/src/test/org/apache/lucene/replicator/nrt/SimpleCopyJob.java
+++ b/lucene/replicator/src/test/org/apache/lucene/replicator/nrt/SimpleCopyJob.java
@@ -1,5 +1,3 @@
-package org.apache.lucene.replicator.nrt;
-
/*
* 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.lucene.replicator.nrt;
* limitations under the License.
*/
+package org.apache.lucene.replicator.nrt;
+
import java.io.IOException;
import java.util.HashSet;
import java.util.Iterator;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/629346fe/lucene/replicator/src/test/org/apache/lucene/replicator/nrt/SimplePrimaryNode.java
----------------------------------------------------------------------
diff --git a/lucene/replicator/src/test/org/apache/lucene/replicator/nrt/SimplePrimaryNode.java b/lucene/replicator/src/test/org/apache/lucene/replicator/nrt/SimplePrimaryNode.java
index 3d41b32..bb39135 100644
--- a/lucene/replicator/src/test/org/apache/lucene/replicator/nrt/SimplePrimaryNode.java
+++ b/lucene/replicator/src/test/org/apache/lucene/replicator/nrt/SimplePrimaryNode.java
@@ -1,5 +1,3 @@
-package org.apache.lucene.replicator.nrt;
-
/*
* 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.lucene.replicator.nrt;
* limitations under the License.
*/
+package org.apache.lucene.replicator.nrt;
+
import java.io.BufferedOutputStream;
import java.io.EOFException;
import java.io.IOException;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/629346fe/lucene/replicator/src/test/org/apache/lucene/replicator/nrt/SimpleReplicaNode.java
----------------------------------------------------------------------
diff --git a/lucene/replicator/src/test/org/apache/lucene/replicator/nrt/SimpleReplicaNode.java b/lucene/replicator/src/test/org/apache/lucene/replicator/nrt/SimpleReplicaNode.java
index 6948b78..c394c65 100644
--- a/lucene/replicator/src/test/org/apache/lucene/replicator/nrt/SimpleReplicaNode.java
+++ b/lucene/replicator/src/test/org/apache/lucene/replicator/nrt/SimpleReplicaNode.java
@@ -1,5 +1,3 @@
-package org.apache.lucene.replicator.nrt;
-
/*
* 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.lucene.replicator.nrt;
* limitations under the License.
*/
+package org.apache.lucene.replicator.nrt;
+
import java.io.BufferedOutputStream;
import java.io.EOFException;
import java.io.IOException;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/629346fe/lucene/replicator/src/test/org/apache/lucene/replicator/nrt/SimpleServer.java
----------------------------------------------------------------------
diff --git a/lucene/replicator/src/test/org/apache/lucene/replicator/nrt/SimpleServer.java b/lucene/replicator/src/test/org/apache/lucene/replicator/nrt/SimpleServer.java
index 49d2ce2..20c3f61 100644
--- a/lucene/replicator/src/test/org/apache/lucene/replicator/nrt/SimpleServer.java
+++ b/lucene/replicator/src/test/org/apache/lucene/replicator/nrt/SimpleServer.java
@@ -1,5 +1,3 @@
-package org.apache.lucene.replicator.nrt;
-
/*
* 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.lucene.replicator.nrt;
* limitations under the License.
*/
+package org.apache.lucene.replicator.nrt;
+
import java.io.BufferedInputStream;
import java.io.BufferedOutputStream;
import java.io.IOException;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/629346fe/lucene/replicator/src/test/org/apache/lucene/replicator/nrt/SimpleTransLog.java
----------------------------------------------------------------------
diff --git a/lucene/replicator/src/test/org/apache/lucene/replicator/nrt/SimpleTransLog.java b/lucene/replicator/src/test/org/apache/lucene/replicator/nrt/SimpleTransLog.java
index dd2085f..ce75a29 100644
--- a/lucene/replicator/src/test/org/apache/lucene/replicator/nrt/SimpleTransLog.java
+++ b/lucene/replicator/src/test/org/apache/lucene/replicator/nrt/SimpleTransLog.java
@@ -1,5 +1,3 @@
-package org.apache.lucene.replicator.nrt;
-
/*
* 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.lucene.replicator.nrt;
* limitations under the License.
*/
+package org.apache.lucene.replicator.nrt;
+
import java.io.Closeable;
import java.io.EOFException;
import java.io.IOException;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/629346fe/lucene/replicator/src/test/org/apache/lucene/replicator/nrt/TestNRTReplication.java
----------------------------------------------------------------------
diff --git a/lucene/replicator/src/test/org/apache/lucene/replicator/nrt/TestNRTReplication.java b/lucene/replicator/src/test/org/apache/lucene/replicator/nrt/TestNRTReplication.java
index f98cf8d..a2e7cf9 100644
--- a/lucene/replicator/src/test/org/apache/lucene/replicator/nrt/TestNRTReplication.java
+++ b/lucene/replicator/src/test/org/apache/lucene/replicator/nrt/TestNRTReplication.java
@@ -1,5 +1,3 @@
-package org.apache.lucene.replicator.nrt;
-
/*
* 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.lucene.replicator.nrt;
* limitations under the License.
*/
+package org.apache.lucene.replicator.nrt;
+
import java.io.BufferedReader;
import java.io.IOException;
import java.io.InputStreamReader;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/629346fe/lucene/replicator/src/test/org/apache/lucene/replicator/nrt/TestStressNRTReplication.java
----------------------------------------------------------------------
diff --git a/lucene/replicator/src/test/org/apache/lucene/replicator/nrt/TestStressNRTReplication.java b/lucene/replicator/src/test/org/apache/lucene/replicator/nrt/TestStressNRTReplication.java
index b53dc78..045bb38 100644
--- a/lucene/replicator/src/test/org/apache/lucene/replicator/nrt/TestStressNRTReplication.java
+++ b/lucene/replicator/src/test/org/apache/lucene/replicator/nrt/TestStressNRTReplication.java
@@ -1,5 +1,3 @@
-package org.apache.lucene.replicator.nrt;
-
/*
* 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.lucene.replicator.nrt;
* limitations under the License.
*/
+package org.apache.lucene.replicator.nrt;
+
import java.io.BufferedReader;
import java.io.Closeable;
import java.io.IOException;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/629346fe/lucene/replicator/src/test/org/apache/lucene/replicator/nrt/ThreadPumper.java
----------------------------------------------------------------------
diff --git a/lucene/replicator/src/test/org/apache/lucene/replicator/nrt/ThreadPumper.java b/lucene/replicator/src/test/org/apache/lucene/replicator/nrt/ThreadPumper.java
index 73f3908..ff57ea6 100644
--- a/lucene/replicator/src/test/org/apache/lucene/replicator/nrt/ThreadPumper.java
+++ b/lucene/replicator/src/test/org/apache/lucene/replicator/nrt/ThreadPumper.java
@@ -1,5 +1,3 @@
-package org.apache.lucene.replicator.nrt;
-
/*
* 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.lucene.replicator.nrt;
* limitations under the License.
*/
+package org.apache.lucene.replicator.nrt;
+
import java.io.BufferedReader;
import java.io.IOException;
import java.io.PrintStream;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/629346fe/lucene/spatial/src/java/org/apache/lucene/spatial/geopoint/document/GeoPointTokenStream.java
----------------------------------------------------------------------
diff --git a/lucene/spatial/src/java/org/apache/lucene/spatial/geopoint/document/GeoPointTokenStream.java b/lucene/spatial/src/java/org/apache/lucene/spatial/geopoint/document/GeoPointTokenStream.java
index cc5d8f2..2808f44 100644
--- a/lucene/spatial/src/java/org/apache/lucene/spatial/geopoint/document/GeoPointTokenStream.java
+++ b/lucene/spatial/src/java/org/apache/lucene/spatial/geopoint/document/GeoPointTokenStream.java
@@ -1,5 +1,3 @@
-package org.apache.lucene.spatial.geopoint.document;
-
/*
* 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.lucene.spatial.geopoint.document;
* limitations under the License.
*/
+package org.apache.lucene.spatial.geopoint.document;
+
import java.util.Objects;
import org.apache.lucene.analysis.TokenStream;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/629346fe/lucene/spatial/src/test/org/apache/lucene/spatial/util/TestGeoPointField.java
----------------------------------------------------------------------
diff --git a/lucene/spatial/src/test/org/apache/lucene/spatial/util/TestGeoPointField.java b/lucene/spatial/src/test/org/apache/lucene/spatial/util/TestGeoPointField.java
index 567d46d..1e4f478 100644
--- a/lucene/spatial/src/test/org/apache/lucene/spatial/util/TestGeoPointField.java
+++ b/lucene/spatial/src/test/org/apache/lucene/spatial/util/TestGeoPointField.java
@@ -1,5 +1,3 @@
-package org.apache.lucene.spatial.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.lucene.spatial.util;
* limitations under the License.
*/
+package org.apache.lucene.spatial.util;
+
import org.apache.lucene.spatial.geopoint.document.GeoPointField;
import org.apache.lucene.util.BytesRefBuilder;
import org.apache.lucene.util.LuceneTestCase;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/629346fe/lucene/test-framework/src/java/org/apache/lucene/analysis/MockSynonymAnalyzer.java
----------------------------------------------------------------------
diff --git a/lucene/test-framework/src/java/org/apache/lucene/analysis/MockSynonymAnalyzer.java b/lucene/test-framework/src/java/org/apache/lucene/analysis/MockSynonymAnalyzer.java
index a2ce33e..1bbaabc 100644
--- a/lucene/test-framework/src/java/org/apache/lucene/analysis/MockSynonymAnalyzer.java
+++ b/lucene/test-framework/src/java/org/apache/lucene/analysis/MockSynonymAnalyzer.java
@@ -1,5 +1,3 @@
-package org.apache.lucene.analysis;
-
/*
* 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.lucene.analysis;
* limitations under the License.
*/
+package org.apache.lucene.analysis;
+
/** adds synonym of "dog" for "dogs", and synonym of "cavy" for "guinea pig". */
public class MockSynonymAnalyzer extends Analyzer {
@Override
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/629346fe/lucene/test-framework/src/java/org/apache/lucene/analysis/MockSynonymFilter.java
----------------------------------------------------------------------
diff --git a/lucene/test-framework/src/java/org/apache/lucene/analysis/MockSynonymFilter.java b/lucene/test-framework/src/java/org/apache/lucene/analysis/MockSynonymFilter.java
index b50be07..1d8b513 100644
--- a/lucene/test-framework/src/java/org/apache/lucene/analysis/MockSynonymFilter.java
+++ b/lucene/test-framework/src/java/org/apache/lucene/analysis/MockSynonymFilter.java
@@ -1,5 +1,3 @@
-package org.apache.lucene.analysis;
-
/*
* 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.lucene.analysis;
* limitations under the License.
*/
+package org.apache.lucene.analysis;
+
import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/629346fe/lucene/test-framework/src/java/org/apache/lucene/geo/EarthDebugger.java
----------------------------------------------------------------------
diff --git a/lucene/test-framework/src/java/org/apache/lucene/geo/EarthDebugger.java b/lucene/test-framework/src/java/org/apache/lucene/geo/EarthDebugger.java
index 4f68adb..3553b15 100644
--- a/lucene/test-framework/src/java/org/apache/lucene/geo/EarthDebugger.java
+++ b/lucene/test-framework/src/java/org/apache/lucene/geo/EarthDebugger.java
@@ -1,5 +1,3 @@
-package org.apache.lucene.geo;
-
/*
* 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.lucene.geo;
* limitations under the License.
*/
+package org.apache.lucene.geo;
+
import org.apache.lucene.util.SloppyMath;
/** Draws shapes on the earth surface and renders using the very cool http://www.webglearth.org.
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/629346fe/lucene/test-framework/src/java/org/apache/lucene/mockfile/VirusCheckingFS.java
----------------------------------------------------------------------
diff --git a/lucene/test-framework/src/java/org/apache/lucene/mockfile/VirusCheckingFS.java b/lucene/test-framework/src/java/org/apache/lucene/mockfile/VirusCheckingFS.java
index 2c24d10..eff62b1 100644
--- a/lucene/test-framework/src/java/org/apache/lucene/mockfile/VirusCheckingFS.java
+++ b/lucene/test-framework/src/java/org/apache/lucene/mockfile/VirusCheckingFS.java
@@ -1,5 +1,3 @@
-package org.apache.lucene.mockfile;
-
/*
* 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.lucene.mockfile;
* limitations under the License.
*/
+package org.apache.lucene.mockfile;
+
import java.io.IOException;
import java.nio.file.AccessDeniedException;
import java.nio.file.FileSystem;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/629346fe/lucene/test-framework/src/test/org/apache/lucene/mockfile/TestVirusCheckingFS.java
----------------------------------------------------------------------
diff --git a/lucene/test-framework/src/test/org/apache/lucene/mockfile/TestVirusCheckingFS.java b/lucene/test-framework/src/test/org/apache/lucene/mockfile/TestVirusCheckingFS.java
index 4a34ab8..91e9aa8 100644
--- a/lucene/test-framework/src/test/org/apache/lucene/mockfile/TestVirusCheckingFS.java
+++ b/lucene/test-framework/src/test/org/apache/lucene/mockfile/TestVirusCheckingFS.java
@@ -1,5 +1,3 @@
-package org.apache.lucene.mockfile;
-
/*
* 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.lucene.mockfile;
* limitations under the License.
*/
+package org.apache.lucene.mockfile;
+
import java.io.IOException;
import java.io.OutputStream;
import java.net.URI;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/629346fe/solr/core/src/java/org/apache/solr/cloud/LockTree.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/cloud/LockTree.java b/solr/core/src/java/org/apache/solr/cloud/LockTree.java
index d629d1c..8ae7f75 100644
--- a/solr/core/src/java/org/apache/solr/cloud/LockTree.java
+++ b/solr/core/src/java/org/apache/solr/cloud/LockTree.java
@@ -1,18 +1,3 @@
-package org.apache.solr.cloud;
-
-import java.lang.invoke.MethodHandles;
-import java.util.HashMap;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-
-import org.apache.solr.cloud.OverseerMessageHandler.Lock;
-import org.apache.solr.common.params.CollectionParams;
-import org.apache.solr.common.params.CollectionParams.LockLevel;
-import org.apache.solr.common.util.StrUtils;
-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
@@ -30,6 +15,21 @@ import org.slf4j.LoggerFactory;
* limitations under the License.
*/
+package org.apache.solr.cloud;
+
+import java.lang.invoke.MethodHandles;
+import java.util.HashMap;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.solr.cloud.OverseerMessageHandler.Lock;
+import org.apache.solr.common.params.CollectionParams;
+import org.apache.solr.common.params.CollectionParams.LockLevel;
+import org.apache.solr.common.util.StrUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
/**
* This is a utility class that offers fine grained locking for various Collection Operations
* This class is designed for single threaded operation. It's safe for multiple threads to use it
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/629346fe/solr/core/src/java/org/apache/solr/core/backup/repository/BackupRepositoryFactory.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/core/backup/repository/BackupRepositoryFactory.java b/solr/core/src/java/org/apache/solr/core/backup/repository/BackupRepositoryFactory.java
index d035874..aaccceb 100644
--- a/solr/core/src/java/org/apache/solr/core/backup/repository/BackupRepositoryFactory.java
+++ b/solr/core/src/java/org/apache/solr/core/backup/repository/BackupRepositoryFactory.java
@@ -1,5 +1,3 @@
-package org.apache.solr.core.backup.repository;
-
/*
* 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.core.backup.repository;
* limitations under the License.
*/
+package org.apache.solr.core.backup.repository;
+
import java.lang.invoke.MethodHandles;
import java.util.HashMap;
import java.util.Map;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/629346fe/solr/core/src/java/org/apache/solr/core/backup/repository/HdfsBackupRepository.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/core/backup/repository/HdfsBackupRepository.java b/solr/core/src/java/org/apache/solr/core/backup/repository/HdfsBackupRepository.java
index 596c271..bb148de 100644
--- a/solr/core/src/java/org/apache/solr/core/backup/repository/HdfsBackupRepository.java
+++ b/solr/core/src/java/org/apache/solr/core/backup/repository/HdfsBackupRepository.java
@@ -1,5 +1,3 @@
-package org.apache.solr.core.backup.repository;
-
/*
* 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.core.backup.repository;
* limitations under the License.
*/
+package org.apache.solr.core.backup.repository;
+
import java.io.IOException;
import java.io.OutputStream;
import java.net.URI;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/629346fe/solr/core/src/java/org/apache/solr/core/backup/repository/LocalFileSystemRepository.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/core/backup/repository/LocalFileSystemRepository.java b/solr/core/src/java/org/apache/solr/core/backup/repository/LocalFileSystemRepository.java
index bb75a9e..4eb7790 100644
--- a/solr/core/src/java/org/apache/solr/core/backup/repository/LocalFileSystemRepository.java
+++ b/solr/core/src/java/org/apache/solr/core/backup/repository/LocalFileSystemRepository.java
@@ -1,5 +1,3 @@
-package org.apache.solr.core.backup.repository;
-
/*
* 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.core.backup.repository;
* limitations under the License.
*/
+package org.apache.solr.core.backup.repository;
+
import java.io.IOException;
import java.io.OutputStream;
import java.net.URI;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/629346fe/solr/core/src/java/org/apache/solr/handler/GraphHandler.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/handler/GraphHandler.java b/solr/core/src/java/org/apache/solr/handler/GraphHandler.java
index c4b42d9..4b043b2 100644
--- a/solr/core/src/java/org/apache/solr/handler/GraphHandler.java
+++ b/solr/core/src/java/org/apache/solr/handler/GraphHandler.java
@@ -1,5 +1,3 @@
-package org.apache.solr.handler;
-
/*
* 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.handler;
* limitations under the License.
*/
+package org.apache.solr.handler;
+
import java.io.IOException;
import java.lang.invoke.MethodHandles;
import java.util.HashMap;
@@ -278,4 +278,4 @@ public class GraphHandler extends RequestHandlerBase implements SolrCoreAware, P
}
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/629346fe/solr/core/src/java/org/apache/solr/response/GraphMLResponseWriter.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/response/GraphMLResponseWriter.java b/solr/core/src/java/org/apache/solr/response/GraphMLResponseWriter.java
index d941991..7f2fac2 100644
--- a/solr/core/src/java/org/apache/solr/response/GraphMLResponseWriter.java
+++ b/solr/core/src/java/org/apache/solr/response/GraphMLResponseWriter.java
@@ -1,5 +1,3 @@
-package org.apache.solr.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.response;
* limitations under the License.
*/
+package org.apache.solr.response;
+
import java.io.IOException;
import java.io.PrintWriter;
import java.io.Writer;
@@ -164,4 +164,4 @@ public class GraphMLResponseWriter implements QueryResponseWriter {
return s;
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/629346fe/solr/core/src/java/org/apache/solr/security/AutorizationEditOperation.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/security/AutorizationEditOperation.java b/solr/core/src/java/org/apache/solr/security/AutorizationEditOperation.java
index f60b6dd..88c7987 100644
--- a/solr/core/src/java/org/apache/solr/security/AutorizationEditOperation.java
+++ b/solr/core/src/java/org/apache/solr/security/AutorizationEditOperation.java
@@ -1,18 +1,3 @@
-package org.apache.solr.security;
-
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.atomic.AtomicInteger;
-import java.util.stream.Collectors;
-
-import org.apache.solr.util.CommandOperation;
-
-import static org.apache.solr.common.util.Utils.getDeepCopy;
-import static org.apache.solr.handler.admin.SecurityConfHandler.getListValue;
-import static org.apache.solr.handler.admin.SecurityConfHandler.getMapValue;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
@@ -30,6 +15,20 @@ import static org.apache.solr.handler.admin.SecurityConfHandler.getMapValue;
* limitations under the License.
*/
+package org.apache.solr.security;
+
+import java.util.ArrayList;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.stream.Collectors;
+
+import org.apache.solr.util.CommandOperation;
+
+import static org.apache.solr.common.util.Utils.getDeepCopy;
+import static org.apache.solr.handler.admin.SecurityConfHandler.getListValue;
+import static org.apache.solr.handler.admin.SecurityConfHandler.getMapValue;
enum AutorizationEditOperation {
SET_USER_ROLE("set-user-role") {
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/629346fe/solr/core/src/java/org/apache/solr/security/Permission.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/security/Permission.java b/solr/core/src/java/org/apache/solr/security/Permission.java
index 0084bdc..33ae8f7 100644
--- a/solr/core/src/java/org/apache/solr/security/Permission.java
+++ b/solr/core/src/java/org/apache/solr/security/Permission.java
@@ -1,3 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package org.apache.solr.security;
import java.util.Collection;
@@ -19,24 +36,6 @@ import static java.util.Collections.singleton;
import static java.util.Collections.singletonList;
import static org.apache.solr.common.params.CommonParams.NAME;
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
class Permission {
String name;
Set<String> path, role, collections, method;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/629346fe/solr/core/src/java/org/apache/solr/security/PermissionNameProvider.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/security/PermissionNameProvider.java b/solr/core/src/java/org/apache/solr/security/PermissionNameProvider.java
index 4b6af47..d0e5c9a 100644
--- a/solr/core/src/java/org/apache/solr/security/PermissionNameProvider.java
+++ b/solr/core/src/java/org/apache/solr/security/PermissionNameProvider.java
@@ -1,5 +1,3 @@
-package org.apache.solr.security;
-
/*
* 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.security;
* limitations under the License.
*/
+package org.apache.solr.security;
+
import java.util.HashSet;
import java.util.Map;
import java.util.Set;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/629346fe/solr/core/src/java/org/apache/solr/update/IndexFingerprint.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/update/IndexFingerprint.java b/solr/core/src/java/org/apache/solr/update/IndexFingerprint.java
index 7b8a731..01cf9a6 100644
--- a/solr/core/src/java/org/apache/solr/update/IndexFingerprint.java
+++ b/solr/core/src/java/org/apache/solr/update/IndexFingerprint.java
@@ -1,5 +1,3 @@
-package org.apache.solr.update;
-
/*
* 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.update;
* limitations under the License.
*/
+package org.apache.solr.update;
+
import java.io.IOException;
import java.lang.invoke.MethodHandles;
import java.util.LinkedHashMap;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/629346fe/solr/core/src/java/org/apache/solr/update/processor/ClassificationUpdateProcessor.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/update/processor/ClassificationUpdateProcessor.java b/solr/core/src/java/org/apache/solr/update/processor/ClassificationUpdateProcessor.java
index 9344fb9..7e385dc 100644
--- a/solr/core/src/java/org/apache/solr/update/processor/ClassificationUpdateProcessor.java
+++ b/solr/core/src/java/org/apache/solr/update/processor/ClassificationUpdateProcessor.java
@@ -1,3 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package org.apache.solr.update.processor;
import java.io.IOException;
@@ -17,23 +34,6 @@ import org.apache.solr.schema.IndexSchema;
import org.apache.solr.schema.SchemaField;
import org.apache.solr.update.AddUpdateCommand;
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
/**
* This Class is a Request Update Processor to classify the document in input and add a field
* containing the class to the Document.
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/629346fe/solr/core/src/java/org/apache/solr/update/processor/ClassificationUpdateProcessorFactory.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/update/processor/ClassificationUpdateProcessorFactory.java b/solr/core/src/java/org/apache/solr/update/processor/ClassificationUpdateProcessorFactory.java
index a70f21d..692a114 100644
--- a/solr/core/src/java/org/apache/solr/update/processor/ClassificationUpdateProcessorFactory.java
+++ b/solr/core/src/java/org/apache/solr/update/processor/ClassificationUpdateProcessorFactory.java
@@ -1,13 +1,3 @@
-package org.apache.solr.update.processor;
-
-import org.apache.lucene.index.LeafReader;
-import org.apache.solr.common.SolrException;
-import org.apache.solr.common.params.SolrParams;
-import org.apache.solr.common.util.NamedList;
-import org.apache.solr.request.SolrQueryRequest;
-import org.apache.solr.response.SolrQueryResponse;
-import org.apache.solr.schema.IndexSchema;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
@@ -25,6 +15,16 @@ import org.apache.solr.schema.IndexSchema;
* limitations under the License.
*/
+package org.apache.solr.update.processor;
+
+import org.apache.lucene.index.IndexReader;
+import org.apache.solr.common.SolrException;
+import org.apache.solr.common.params.SolrParams;
+import org.apache.solr.common.util.NamedList;
+import org.apache.solr.request.SolrQueryRequest;
+import org.apache.solr.response.SolrQueryResponse;
+import org.apache.solr.schema.IndexSchema;
+
/**
* This class implements an UpdateProcessorFactory for the Classification Update Processor.
* It takes in input a series of parameter that will be necessary to instantiate and use the Classifier
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/629346fe/solr/core/src/test/org/apache/solr/cloud/CreateCollectionCleanupTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/cloud/CreateCollectionCleanupTest.java b/solr/core/src/test/org/apache/solr/cloud/CreateCollectionCleanupTest.java
index 2d1a7f8..989e1af 100644
--- a/solr/core/src/test/org/apache/solr/cloud/CreateCollectionCleanupTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/CreateCollectionCleanupTest.java
@@ -1,5 +1,3 @@
-package org.apache.solr.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.cloud;
* limitations under the License.
*/
+package org.apache.solr.cloud;
+
import java.util.ArrayList;
import java.util.Properties;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/629346fe/solr/core/src/test/org/apache/solr/cloud/OverseerModifyCollectionTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/cloud/OverseerModifyCollectionTest.java b/solr/core/src/test/org/apache/solr/cloud/OverseerModifyCollectionTest.java
index 6809b6d..e902ab4 100644
--- a/solr/core/src/test/org/apache/solr/cloud/OverseerModifyCollectionTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/OverseerModifyCollectionTest.java
@@ -1,3 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package org.apache.solr.cloud;
import static org.apache.solr.client.solrj.SolrRequest.METHOD.POST;
@@ -22,23 +39,6 @@ import org.junit.Test;
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
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
public class OverseerModifyCollectionTest extends AbstractFullDistribZkTestBase {
private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());